From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 2 Oct 2009 20:24:16 +0000 (+0100)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=70e19011df23d77977fcf644d577bb6232b52bd4;hp=2f6082a554b0b3536e7f0e6bf1218508b8b426cf;p=prosody.git

Merge with 0.5
---

diff --git a/net/server.lua b/net/server.lua
index 66272ccc..eb032c17 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -720,7 +720,7 @@ end
 removeserver = function( port )
     local handler = _server[ port ]
     if not handler then
-        return nil, "no server found on port '" .. tostring( port ) "'"
+        return nil, "no server found on port '" .. tostring( port ) .. "'"
     end
     handler.close( )
     _server[ port ] = nil
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index e310be28..0dd4a192 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -258,6 +258,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
@@ -274,18 +275,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 = module:get_option("bosh_ports") or { 5280 };