diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-05-11 13:55:14 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-05-11 13:55:14 +0100 |
| commit | 7a117b4f0f66a6e247080a7e01d560f59465b213 (patch) | |
| tree | d722883ee5166f176f02c54365f769279a64a226 /plugins/mod_c2s.lua | |
| parent | 33a4ee4b14e8ba0b22d038e06ed1daa695ce3648 (diff) | |
| parent | 823ddd56b85334a138c2827a3840f8cc968378c1 (diff) | |
| download | prosody-7a117b4f0f66a6e247080a7e01d560f59465b213.tar.gz prosody-7a117b4f0f66a6e247080a7e01d560f59465b213.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_c2s.lua')
| -rw-r--r-- | plugins/mod_c2s.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua index efef8763..1d2dd6dd 100644 --- a/plugins/mod_c2s.lua +++ b/plugins/mod_c2s.lua @@ -157,7 +157,7 @@ local function session_close(session, reason) 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 |