prosody
aa94cd27df4d
net/server_event.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server_event.lua @ 7341:aa94cd27df4d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 06 Apr 2016 14:50:34 +0200
parent 7338:f8d37227acd7
parent 7339:b5565715fce8
child 7386:5a9af30d5737
line wrap: on
line diff
--- a/net/server_event.lua	Tue Apr 05 20:54:43 2016 +0200
+++ b/net/server_event.lua	Wed Apr 06 14:50:34 2016 +0200
@@ -730,7 +730,6 @@
 	if res or ( err == "timeout" ) then
 		local ip, port = client:getsockname( )
 		local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx )
-		interface:_start_connection( sslctx )
 		debug( "new connection id:", interface.id )
 		return interface, err
 	else