Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 7542:0f92dc8e8b88
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 08 Aug 2016 16:41:09 +0200 |
| parents | 9a73c85baffe a0813737c6fa |
| children | eab307f7435c |
comparison
equal
deleted
inserted
replaced
| 7536:3f8520b59677 | 7542:0f92dc8e8b88 |
|---|---|
| 671 end | 671 end |
| 672 end | 672 end |
| 673 | 673 |
| 674 function listener.onreadtimeout(conn) | 674 function listener.onreadtimeout(conn) |
| 675 local session = sessions[conn]; | 675 local session = sessions[conn]; |
| 676 local host = session.host or session.to_host; | |
| 677 if session then | 676 if session then |
| 677 local host = session.host or session.to_host; | |
| 678 return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); | 678 return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); |
| 679 end | 679 end |
| 680 end | 680 end |
| 681 | 681 |
| 682 function listener.register_outgoing(conn, session) | 682 function listener.register_outgoing(conn, session) |
