Diff

net/server_select.lua @ 7046:6b4232125f32

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 04 Jan 2016 09:09:15 +0000
parent 7042:20ac6972b9aa
parent 7043:14bc5593b97e
child 7074:3ff83773ffc0
line wrap: on
line diff
--- a/net/server_select.lua	Sat Jan 02 20:42:53 2016 +0000
+++ b/net/server_select.lua	Mon Jan 04 09:09:15 2016 +0000
@@ -580,8 +580,9 @@
 						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
 		)