prosody-hg: net/server_select.lua comparison

net.server_select: Return error when SSL handshake fails immediately (thanks Zash)

comparison

equal deleted inserted replaced

-:4dd61fe04db4
+:c3e17766aead
 					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
+return false, err -- handshake failed
 			end
 		)
 	end
 	if luasec then
 		handler.starttls = function( self, _sslctx)
 			-- Secure now (if handshake fails connection will close)
 			ssl = true
 			handler.readbuffer = handshake
 			handler.sendbuffer = handshake
-			handshake( socket ) -- do handshake
+return handshake( socket ) -- do handshake
 		end
 	end
 	handler.readbuffer = _readbuffer
 	handler.sendbuffer = _sendbuffer
 	_readlistlen = addsocket(_readlist, socket, _readlistlen)
 	if sslctx and luasec then
 		out_put "server.lua: auto-starting ssl negotiation..."
 		handler.autostart_ssl = true;
-		handler:starttls(sslctx);
+local ok, err = handler:starttls(sslctx);
+if ok == false then
+return nil, nil, err
+end
 	end
 	return handler, socket
 end

Mercurial > prosody-hg