util.roster: Initial skeleton commit

[prosody.git] / net / server_select.lua

diff --git a/net/server_select.lua b/net/server_select.lua
index e66f105b2077450ded0ed473bb5d514ce7d290a0..298e560aa00cc6a5ab2eebde12b7b53634641a08 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -343,9 +343,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                        _closelist[ handler ] = nil
                        handler = nil
                end
-       if server then
-               server.remove( )
-       end
+               if server then
+                       server.remove( )
+               end
                out_put "server.lua: closed client handler and removed socket from list"
                return true
        end
@@ -479,11 +479,11 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                        bufferqueuelen = 0
                        bufferlen = 0
                        _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist
-                       _ = needtls and handler:starttls(nil, true)
                        _writetimes[ handler ] = nil
                        if drain then
                                drain(handler)
                        end
+                       _ = needtls and handler:starttls(nil, true)
                        _ = toclose and handler:close( )
                        return true
                elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
@@ -520,9 +520,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                                                out_put( "server.lua: ssl handshake done" )
                                                handler.readbuffer = _readbuffer        -- when handshake is done, replace the handshake function with regular functions
                                                handler.sendbuffer = _sendbuffer
-                                               out_put ("server.lua: compression used: "..tostring(client:compression()))
-                                               out_put ("server.lua: finished: "..tostring(client:getfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"))
-                                               out_put ("server.lua: peer finished: "..tostring(client:getpeerfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"))
                                                _ = status and status( handler, "ssl-handshake-complete" )
                                                _readlistlen = addsocket(_readlist, client, _readlistlen)
                                                return true