prosody
22b6b1899a55%3A339a96689dcb

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

2164:339a96689dcb

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Nov 2009 20:35:18 +0000
parents 2163:8d33f94dc3a1 (diff) 2162:22b6b1899a55 (current diff)
children 2166:fb01f0906564
files
diffstat 4 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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