aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-08-20 15:04:17 -0400
committerMatthew Wild <mwild1@gmail.com>2011-08-20 15:04:17 -0400
commitb43b86615bda8be0ede70855aad20fabded66d4c (patch)
tree218b70e552e38991223a03204406ba95ab8bb905 /net
parent7915c70e13765f700b48e2f71f0f9a0efe7c15fb (diff)
downloadprosody-b43b86615bda8be0ede70855aad20fabded66d4c.tar.gz
prosody-b43b86615bda8be0ede70855aad20fabded66d4c.zip
net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations)
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua6
1 files 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