net.server_select: Only allow starttls if luasec is available (thanks Nolan)

[prosody.git] / net / xmppcomponent_listener.lua

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index b353b1b3f1bdd5bb31bb3dea5d88162ce2f52287..0b98b6bce9cd7da66572f6194e3904ee955a8ecb 100644 (file)
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -32,7 +32,7 @@ local xmlns_component = 'jabber:component:accept';
 
 --- Callbacks/data for xmlhandlers to handle streams for us ---
 
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream", default_ns = xmlns_component };
+local stream_callbacks = { default_ns = xmlns_component };
 
 function stream_callbacks.error(session, error, data, data2)
        log("warn", "Error processing component stream: "..tostring(error));
@@ -87,7 +87,7 @@ end
 
 --- Closing a component connection
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
+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)
        local log = session.log or log;
        if session.conn then
@@ -117,7 +117,7 @@ local function session_close(session, reason)
                        end
                end
                session.send("</stream:stream>");
-               session.conn.close();
+               session.conn:close();
                component_listener.ondisconnect(session.conn, "stream error");
        end
 end
@@ -127,7 +127,7 @@ function component_listener.onincoming(conn, data)
        local session = sessions[conn];
        if not session then
                local _send = conn.write;
-               session = { type = "component", conn = conn, send = function (data) return _send(tostring(data)); end };
+               session = { type = "component", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
                sessions[conn] = session;
 
                -- Logging functions --
@@ -169,7 +169,6 @@ function component_listener.ondisconnect(conn, err)
                sessions[conn]  = nil;
                for k in pairs(session) do session[k] = nil; end
                session = nil;
-               collectgarbage("collect");
        end
 end