Mercurial > prosody-hg

comparison plugins/mod_s2s/mod_s2s.lua @ 6666:42fdc8dddf04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 06 May 2015 19:26:53 +0100
parents 832987170da8 65563530375b
children b2e89583d6e6
comparison
equal deleted inserted replaced
6650:cf15b18e9810 6666:42fdc8dddf04
626 end 626 end
627 end 627 end
628 628
629 function listener.onreadtimeout(conn) 629 function listener.onreadtimeout(conn)
630 local session = sessions[conn]; 630 local session = sessions[conn];
631 local host = session.host or session.to_host;
631 if session then 632 if session then
632 return (hosts[session.host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); 633 return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session });
633 end 634 end
634 end 635 end
635 636
636 function listener.register_outgoing(conn, session) 637 function listener.register_outgoing(conn, session)
637 sessions[conn] = session; 638 sessions[conn] = session;