prosody
b5565715fce8
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 @ 7339:b5565715fce8

server_event: addclient: wrapclient already calls startconnection for us [backported from trunk]
author daurnimator <quae@daurnimator.com>
date Wed, 18 Dec 2013 18:11:47 -0500
parent 7337:8ec935687bae
child 7341:aa94cd27df4d
child 7385:17929cdacec2
line wrap: on
line diff
--- a/net/server_event.lua	Tue Apr 05 20:41:50 2016 +0200
+++ b/net/server_event.lua	Wed Dec 18 18:11:47 2013 -0500
@@ -97,7 +97,7 @@
 	return self:_destroy();
 end
 
-function interface_mt:_start_connection(plainssl) -- should be called from addclient
+function interface_mt:_start_connection(plainssl) -- called from wrapclient
 	local callback = function( event )
 		if EV_TIMEOUT == event then  -- timeout during connection
 			self.fatalerror = "connection timeout"
@@ -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