prosody
19e1f9881bfc
plugins/mod_c2s.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/mod_c2s.lua @ 5572:19e1f9881bfc

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 May 2013 22:31:20 +0200
parent 5571:ae9672f4079a
child 5638:c5b7f4858014
child 5757:b5ba004beb0a
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