aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-22 16:45:27 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-22 16:45:27 +0100
commit2057401904191d1ee3d7f6e6e620484d954a852d (patch)
tree5838f58bd25e9ecd3a4d8cdf86841f8521e62776 /plugins
parent07c9903d58c0d350e705f41a5f4ef780f17fa659 (diff)
downloadprosody-2057401904191d1ee3d7f6e6e620484d954a852d.tar.gz
prosody-2057401904191d1ee3d7f6e6e620484d954a852d.zip
mod_s2s: Make unauthed session timeout a little more aggressive... otherwise it's possible for sessions to slip under the net and never get killed off
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index f6c20606..1dbdc6ee 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -413,11 +413,9 @@ local function initialize_session(session)
return handlestanza(session, stanza);
end
- local conn = session.conn;
add_task(connect_timeout, function ()
- if session.conn ~= conn or session.connecting
- or session.type == "s2sin" or session.type == "s2sout" then
- return; -- Ok, we're connect[ed|ing]
+ if session.type == "s2sin" or session.type == "s2sout" then
+ return; -- Ok, we're connected
end
-- Not connected, need to close session and clean up
(session.log or log)("debug", "Destroying incomplete session %s->%s due to inactivity",