Software / code / prosody
Changeset
5963:3bd90108cc3c
net/server: addclient: wrapclient already calls startconnection for us
| author | daurnimator <quae@daurnimator.com> |
|---|---|
| date | Wed, 18 Dec 2013 18:11:47 -0500 |
| parents | 5962:27eacbb6e71f |
| children | 5964:ad04170d6533 |
| files | net/server_event.lua |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_event.lua Wed Dec 18 18:11:17 2013 -0500 +++ b/net/server_event.lua Wed Dec 18 18:11:47 2013 -0500 @@ -128,7 +128,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" @@ -751,7 +751,6 @@ 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
