Merge with trunk

Tue, 24 Nov 2009 20:35:18 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 24 Nov 2009 20:35:18 +0000
changeset 2164
339a96689dcb
parent 2162
8d33f94dc3a1 (diff)
parent 2163
22b6b1899a55 (current diff)
child 2166
fb01f0906564

Merge with trunk

--- a/core/sessionmanager.lua	Tue Nov 24 14:37:14 2009 +0500
+++ b/core/sessionmanager.lua	Tue Nov 24 20:35:18 2009 +0000
@@ -10,7 +10,6 @@
 
 local tonumber, tostring = tonumber, tostring;
 local ipairs, pairs, print, next= ipairs, pairs, print, next;
-local collectgarbage = collectgarbage;
 local format = import("string", "format");
 
 local hosts = hosts;
--- a/net/xmppclient_listener.lua	Tue Nov 24 14:37:14 2009 +0500
+++ b/net/xmppclient_listener.lua	Tue Nov 24 20:35:18 2009 +0000
@@ -140,7 +140,6 @@
 		sm_destroy_session(session, err);
 		sessions[conn]  = nil;
 		session = nil;
-		collectgarbage("collect");
 	end
 end
 
--- a/net/xmppcomponent_listener.lua	Tue Nov 24 14:37:14 2009 +0500
+++ b/net/xmppcomponent_listener.lua	Tue Nov 24 20:35:18 2009 +0000
@@ -169,7 +169,6 @@
 		sessions[conn]  = nil;
 		for k in pairs(session) do session[k] = nil; end
 		session = nil;
-		collectgarbage("collect");
 	end
 end
 
--- a/net/xmppserver_listener.lua	Tue Nov 24 14:37:14 2009 +0500
+++ b/net/xmppserver_listener.lua	Tue Nov 24 20:35:18 2009 +0000
@@ -162,7 +162,6 @@
 		s2s_destroy_session(session);
 		sessions[conn]  = nil;
 		session = nil;
-		collectgarbage("collect");
 	end
 end
 

mercurial