# HG changeset patch # User daurnimator # Date 1387408307 18000 # Node ID b5565715fce85f9ef95e7c81d4fb8a27a09f7b1a # Parent 8ec935687baef34399c45439b75b520a71367738 server_event: addclient: wrapclient already calls startconnection for us [backported from trunk] diff -r 8ec935687bae -r b5565715fce8 net/server_event.lua --- 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