aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-05-06 19:26:53 +0100
committerMatthew Wild <mwild1@gmail.com>2015-05-06 19:26:53 +0100
commitdaec51c435ca77914271200607841d55ff7408d7 (patch)
tree15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /plugins/mod_s2s/mod_s2s.lua
parentba96c2f7db5ce079d7609dff90591b9872ba6143 (diff)
parenta540d613cd08b8feee096d19b727d1f5b2cab507 (diff)
downloadprosody-daec51c435ca77914271200607841d55ff7408d7.tar.gz
prosody-daec51c435ca77914271200607841d55ff7408d7.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua3
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