aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2013-12-18 18:11:47 -0500
committerdaurnimator <quae@daurnimator.com>2013-12-18 18:11:47 -0500
commita96b73666121d0248d8bab7d93218a1e822fd87e (patch)
tree36005e7fa66f62462f59796229f45b807fb3d632
parent5c224f9d182a770df51727fbad0798c8e9fe9b31 (diff)
downloadprosody-a96b73666121d0248d8bab7d93218a1e822fd87e.tar.gz
prosody-a96b73666121d0248d8bab7d93218a1e822fd87e.zip
server_event: addclient: wrapclient already calls startconnection for us [backported from trunk]
-rw-r--r--net/server_event.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 0c3c4b04..2edc9a0c 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -97,7 +97,7 @@ function interface_mt:_close()
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 @@ local function addclient( addr, serverport, listener, pattern, sslctx, typ )
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