Changeset

5572:19e1f9881bfc

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 May 2013 22:31:20 +0200
parents 5570:f592409f5fcd (current diff) 5571:ae9672f4079a (diff)
children 5575:345593806e22
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_c2s.lua	Fri May 10 10:48:07 2013 +0100
+++ b/plugins/mod_c2s.lua	Fri May 10 22:31:20 2013 +0200
@@ -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