diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-01-04 09:09:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-01-04 09:09:15 +0000 |
| commit | a49b476d83f97960c80fa860b68073bebf5c5d93 (patch) | |
| tree | dee56adb63417f62c3f2ae5a05fa108f05122f73 /net | |
| parent | 8525a177737252f17ef63a09047b9bbac7f61282 (diff) | |
| parent | d0bf02ff6639f9cd0cea23848e74361bad19640d (diff) | |
| download | prosody-a49b476d83f97960c80fa860b68073bebf5c5d93.tar.gz prosody-a49b476d83f97960c80fa860b68073bebf5c5d93.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_select.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index ced73074..4df6e12d 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -580,8 +580,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport coroutine_yield( ) -- handshake not finished end end - out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") ) - _ = handler and handler:force_close("ssl handshake failed") + err = "ssl handshake error: " .. ( err or "handshake too long" ); + out_put( "server.lua: ", err ); + _ = handler and handler:force_close(err) return false, err -- handshake failed end ) |