diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-08-20 15:04:17 -0400 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-08-20 15:04:17 -0400 |
| commit | 25a5e8060ff0ebe511f57f4faaf2bc7e930597f3 (patch) | |
| tree | 218b70e552e38991223a03204406ba95ab8bb905 | |
| parent | 346458a5c35ff6433da210a7a24f7590f9f501a9 (diff) | |
| download | prosody-25a5e8060ff0ebe511f57f4faaf2bc7e930597f3.tar.gz prosody-25a5e8060ff0ebe511f57f4faaf2bc7e930597f3.zip | |
net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations)
| -rw-r--r-- | net/server_select.lua | 6 |
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 |