aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-01-04 09:09:15 +0000
committerMatthew Wild <mwild1@gmail.com>2016-01-04 09:09:15 +0000
commit6a39c2064ccd3956857494208013e95515c3d6fd (patch)
treedee56adb63417f62c3f2ae5a05fa108f05122f73 /net
parent6d5bf3651160efa69fb89bd2f92b11f7d69f4034 (diff)
parentdc21fd08f46d714de6f8b8318b3c3ee212e97e2f (diff)
downloadprosody-6a39c2064ccd3956857494208013e95515c3d6fd.tar.gz
prosody-6a39c2064ccd3956857494208013e95515c3d6fd.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua5
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
)