diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
| commit | 125dc63f565a46aedcb1750c45dcc97c71c2c72b (patch) | |
| tree | 15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /plugins/mod_s2s | |
| parent | 83049e63c621c66da5129449f3a610df2e74ce38 (diff) | |
| parent | ec83b2aa91ab9142ad6e7f4d26b0f6d20853e747 (diff) | |
| download | prosody-125dc63f565a46aedcb1750c45dcc97c71c2c72b.tar.gz prosody-125dc63f565a46aedcb1750c45dcc97c71c2c72b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 5a47559e..a861b049 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -628,8 +628,9 @@ end function listener.onreadtimeout(conn) local session = sessions[conn]; + local host = session.host or session.to_host; if session then - return (hosts[session.host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); + return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session }); end end |