# HG changeset patch # User Matthew Wild # Date 1278087880 -3600 # Node ID 88cfe1bba69047c1e9b101fb9ce4be3882945467 # Parent ddcab5be2a5e6b9d83ff2334491c1081293a894d net.server_select: Clean up buffer and fire drained callback on successful write before we try and start TLS negotiation (if negotiation fails instantly then we can be left without a handler to use for cleanup) (thanks dersd) diff -r ddcab5be2a5e -r 88cfe1bba690 net/server_select.lua --- a/net/server_select.lua Fri Jul 02 17:23:17 2010 +0100 +++ b/net/server_select.lua Fri Jul 02 17:24:40 2010 +0100 @@ -479,11 +479,11 @@ 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