X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fserver_select.lua;h=298e560aa00cc6a5ab2eebde12b7b53634641a08;hb=0160777316848c3807928e747224ce8b2ee56b47;hp=e3a389a878864aa959d40fd3338170aa5be1c5c4;hpb=9adde78703cd85056a59b5e4fe005d40428226dc;p=prosody.git

diff --git a/net/server_select.lua b/net/server_select.lua
index e3a389a8..298e560a 100644
--- 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