aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-24 19:04:51 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-24 19:04:51 +0100
commitffd784e8331b3b62a8e74c36c6890f4e893b50c0 (patch)
treeb23a65746327cae09bdb3e07feb36c05e70d4baa
parent20f24311a4d5129f11267c90961e5c657e4898d0 (diff)
downloadprosody-ffd784e8331b3b62a8e74c36c6890f4e893b50c0.tar.gz
prosody-ffd784e8331b3b62a8e74c36c6890f4e893b50c0.zip
Backed out changeset 4adc53e03b4d (garbage collection)
-rw-r--r--core/xmlhandlers.lua2
-rw-r--r--net/xmppclient_listener.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index 13bfacae..3037a848 100644
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -69,7 +69,7 @@ function init_xmlhandlers(session, streamopened)
streamopened(session, attr);
return;
end
- error("Client failed to open stream successfully, it sent tag "..name);
+ error("Client failed to open stream successfully");
end
if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
error("Client sent invalid top-level stanza");
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 542dcd35..068557c8 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -60,7 +60,7 @@ function xmppclient.listener(conn, data)
-- TODO: Below function should be session,stanza - and xmlhandlers should use :method() notation to call,
-- this will avoid the useless indirection we have atm
-- (I'm on a mission, no time to fix now)
- session.stanza_dispatch = function (stanza) collectgarbage("collect"); collectgarbage("collect"); return core_process_stanza(session, stanza); end
+ session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
end
if data then