aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-10-02 21:23:32 +0100
committerMatthew Wild <mwild1@gmail.com>2009-10-02 21:23:32 +0100
commit26b86f46a9ccec536984e9d5b5e73dfad7d88cae (patch)
tree0b4b2afded20f902171f1de0d56f60d80a3ca0f9 /plugins
parent1d9d763906b33bcdbb07837a533cab08a524c70b (diff)
downloadprosody-26b86f46a9ccec536984e9d5b5e73dfad7d88cae.tar.gz
prosody-26b86f46a9ccec536984e9d5b5e73dfad7d88cae.zip
mod_bosh: Fix for 'invalid key to next' error when 2 clients lose connection at the same time
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_bosh.lua11
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 743ebdef..4289628f 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -245,6 +245,7 @@ function stream_callbacks.handlestanza(request, stanza)
end
end
+local dead_sessions = {};
function on_timer()
-- log("debug", "Checking for requests soon to timeout...");
-- Identify requests timing out within the next few seconds
@@ -261,18 +262,26 @@ function on_timer()
end
now = now - 3;
+ local n_dead_sessions = 0;
for session, inactive_since in pairs(inactive_sessions) do
if session.bosh_max_inactive then
if now - inactive_since > session.bosh_max_inactive then
(session.log or log)("debug", "BOSH client inactive too long, destroying session at %d", now);
sessions[session.sid] = nil;
inactive_sessions[session] = nil;
- sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
+ n_dead_sessions = n_dead_sessions + 1;
+ dead_sessions[n_dead_sessions] = session;
end
else
inactive_sessions[session] = nil;
end
end
+
+ for i=1,n_dead_sessions do
+ local session = dead_sessions[i];
+ dead_sessions[i] = nil;
+ sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
+ end
end
local ports = config.get(module.host, "core", "bosh_ports") or { 5280 };