Mercurial > prosody-hg
diff plugins/mod_c2s.lua @ 5574:40fe8bd35eaa
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 11 May 2013 13:55:14 +0100 |
| parents | ae9672f4079a |
| children | c5b7f4858014 b5ba004beb0a |
line wrap: on
line diff
--- a/plugins/mod_c2s.lua Fri May 10 10:48:07 2013 +0100 +++ b/plugins/mod_c2s.lua Sat May 11 13:55:14 2013 +0100 @@ -157,7 +157,7 @@ session.send("</stream:stream>"); function session.send() return false; end - local reason = (reason and (reason.text or reason.condition)) or reason; + local reason = (reason and (reason.name or reason.text or reason.condition)) or reason; session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed"); -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote