net.server_select: Remove some debugging code.

[prosody.git] / net / xmppcomponent_listener.lua

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index 9d7988cb7ab24f119fc3d707c5aee518ce3a88ba..b87f7c96cf500e285bfbdda8552b1df35c916ad9 100644 (file)
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -106,6 +106,7 @@ end
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
 local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
+       if session.destroyed then return; end
        local log = session.log or log;
        if session.conn then
                if session.notopen then
@@ -163,6 +164,7 @@ function component_listener.onincoming(conn, data)
                function session.data(conn, data)
                        local ok, err = parser:parse(data);
                        if ok then return; end
+                       log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
                        session:close("xml-not-well-formed");
                end
                
@@ -184,7 +186,12 @@ function component_listener.ondisconnect(conn, err)
                        hosts[session.host].connected = nil;
                end
                sessions[conn]  = nil;
-               for k in pairs(session) do session[k] = nil; end
+               for k in pairs(session) do
+                       if k ~= "log" and k ~= "close" then
+                               session[k] = nil;
+                       end
+               end
+               session.destroyed = true;
                session = nil;
        end
 end