diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-08 16:41:09 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-08 16:41:09 +0200 |
commit | 68f3c9dede8ad33e50057c2566964285e18874bc (patch) | |
tree | 28ff249f142d219a8fe1f7ede89996f393084875 /plugins/mod_s2s | |
parent | 0b44bf4b7fbbc088ab2a1d90f7e19c68a46601ea (diff) | |
parent | 3506b088471128c7579c11782dff473223f49579 (diff) | |
download | prosody-68f3c9dede8ad33e50057c2566964285e18874bc.tar.gz prosody-68f3c9dede8ad33e50057c2566964285e18874bc.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
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 |