aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-08 16:41:09 +0200
committerKim Alvefur <zash@zash.se>2016-08-08 16:41:09 +0200
commit69f217b1ca6186253459f8c3d0772b814e7aa0dc (patch)
tree28ff249f142d219a8fe1f7ede89996f393084875 /plugins/mod_s2s/mod_s2s.lua
parentac565db2d8dc8239ab1c6bf4d3fadc2ca8c78d5f (diff)
parent8499f4e7214e86623d614368268913418289254c (diff)
downloadprosody-69f217b1ca6186253459f8c3d0772b814e7aa0dc.tar.gz
prosody-69f217b1ca6186253459f8c3d0772b814e7aa0dc.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index fe674b55..a6fdd254 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -673,8 +673,8 @@ end
function listener.onreadtimeout(conn)
local session = sessions[conn];
- local host = session.host or session.to_host;
if session then
+ local host = session.host or session.to_host;
return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session });
end
end