aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_c2s.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-11 13:55:14 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-11 13:55:14 +0100
commitad7d1c86e904fc90002ba706632f31c3d8b56873 (patch)
treed722883ee5166f176f02c54365f769279a64a226 /plugins/mod_c2s.lua
parent8c189d268e700e18db59afed37af79e61e0f8b20 (diff)
parentd78375a2a11f8cb278ead0230cef31c8a44fb1f3 (diff)
downloadprosody-ad7d1c86e904fc90002ba706632f31c3d8b56873.tar.gz
prosody-ad7d1c86e904fc90002ba706632f31c3d8b56873.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_c2s.lua')
-rw-r--r--plugins/mod_c2s.lua2
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