diff options
| author | daurnimator <quae@daurnimator.com> | 2013-12-18 18:11:47 -0500 |
|---|---|---|
| committer | daurnimator <quae@daurnimator.com> | 2013-12-18 18:11:47 -0500 |
| commit | 039aa3bc4e8d86505f4f8cba4e641a6229aba357 (patch) | |
| tree | 36005e7fa66f62462f59796229f45b807fb3d632 | |
| parent | bf3fdda165bf8010773da1ee58bb3e7237044b40 (diff) | |
| download | prosody-039aa3bc4e8d86505f4f8cba4e641a6229aba357.tar.gz prosody-039aa3bc4e8d86505f4f8cba4e641a6229aba357.zip | |
server_event: addclient: wrapclient already calls startconnection for us [backported from trunk]
| -rw-r--r-- | net/server_event.lua | 3 |
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 |