From 25a5e8060ff0ebe511f57f4faaf2bc7e930597f3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 20 Aug 2011 15:04:17 -0400 Subject: net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations) --- net/server_select.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/server_select.lua b/net/server_select.lua index bb3b12c9..9a0cfa6e 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -535,13 +535,13 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _readlistlen = addsocket(_readlist, client, _readlistlen) read = true else - out_put( "server.lua: ssl handshake error: ", tostring(err) ) break; end - --coroutine_yield( handler, nil, err ) -- handshake not finished - coroutine_yield( ) + err = nil; + coroutine_yield( ) -- handshake not finished end end + out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") ) disconnect( handler, "ssl handshake failed" ) _ = handler and handler:close( true ) -- forced disconnect return false -- handshake failed -- cgit v1.2.3