Makefile: Use runtime set by configure (fixes #629)

[prosody.git] / net / server_event.lua

diff --git a/net/server_event.lua b/net/server_event.lua
index c3a795991466222d9d5092a0a0c6bf26f3164c15..e5705ab5b792bc0045f929b298bb3660766ec686 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -391,11 +391,11 @@ function interface_mt:starttls(sslctx, call_onconnect)
                self:_lock( true, true, true )  -- lock the interface, to not disturb the handshake
                self.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, self.startsslcallback, 0 )  -- add event to start handshake
        else  -- wait until writebuffer is empty
-       self:_lock( true, true, false )
-       debug "ssl session delayed until writebuffer is empty..."
-end
-self.starttls = false;
-return true
+               self:_lock( true, true, false )
+               debug "ssl session delayed until writebuffer is empty..."
+       end
+       self.starttls = false;
+       return true
 end
 
 function interface_mt:setoption(option, value)
@@ -614,6 +614,7 @@ local function handleserver( server, addr, port, pattern, listener, sslctx )  --
        local interface = {
                _connections = 0;
 
+               type = "server";
                conn = server;
                onconnect = listener.onconnect;  -- will be called when new client connected
                eventread = false;  -- read event handler