Mercurial > prosody-hg

comparison plugins/mod_c2s.lua @ 5574:40fe8bd35eaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 11 May 2013 13:55:14 +0100
parents ae9672f4079a
children c5b7f4858014 b5ba004beb0a
comparison
equal deleted inserted replaced
5570:f592409f5fcd 5574:40fe8bd35eaa
155 end 155 end
156 156
157 session.send("</stream:stream>"); 157 session.send("</stream:stream>");
158 function session.send() return false; end 158 function session.send() return false; end
159 159
160 local reason = (reason and (reason.text or reason.condition)) or reason; 160 local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
161 session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed"); 161 session.log("info", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed");
162 162
163 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote 163 -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
164 local conn = session.conn; 164 local conn = session.conn;
165 if reason == nil and not session.notopen and session.type == "c2s" then 165 if reason == nil and not session.notopen and session.type == "c2s" then