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 | b771de25145cf3910acde0e698e32201460d67e3 (patch) | |
| tree | fe133b46b57ffc1e0b925e1d8f761810c130f3b4 /net | |
| parent | ae044f21b05363570a8e8ee96c716e9b4f42f2b9 (diff) | |
| download | prosody-b771de25145cf3910acde0e698e32201460d67e3.tar.gz prosody-b771de25145cf3910acde0e698e32201460d67e3.zip | |
net/server: addclient: wrapclient already calls startconnection for us
Diffstat (limited to 'net')
| -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 502cc80a..81dc4512 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -128,7 +128,7 @@ do 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" @@ -751,7 +751,6 @@ do if res or ( err == "timeout" ) then local ip, port = client:getsockname( ) local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx ) - interface:_start_connection( startssl ) debug( "new connection id:", interface.id ) return interface, err else |