diff options
| author | Kim Alvefur <zash@zash.se> | 2013-05-10 22:31:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-05-10 22:31:20 +0200 |
| commit | 0b768dbfae3b15251162dab315aaef9b23c35589 (patch) | |
| tree | f7786b25fd7e50c5019e193f49d194508100e019 | |
| parent | 8c189d268e700e18db59afed37af79e61e0f8b20 (diff) | |
| parent | dd56030a23ab0ee7c495838688a6729b1fff1e86 (diff) | |
| download | prosody-0b768dbfae3b15251162dab315aaef9b23c35589.tar.gz prosody-0b768dbfae3b15251162dab315aaef9b23c35589.zip | |
Merge 0.9->trunk
| -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 |