diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-12-16 23:32:29 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-12-16 23:32:29 +0000 |
| commit | 75633b28898dde724b07a805b6e55d8255b6544e (patch) | |
| tree | ab0fddd4e080c463c9921b89873ff055071dd4e8 /net/server_select.lua | |
| parent | 3cb94419f20cc327d4137b1f4751a27cfcf91ccc (diff) | |
| parent | bcc1c1a7d3db5accfe856b511ef946446b929312 (diff) | |
| download | prosody-75633b28898dde724b07a805b6e55d8255b6544e.tar.gz prosody-75633b28898dde724b07a805b6e55d8255b6544e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server_select.lua')
| -rw-r--r-- | net/server_select.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 4721d6ad..c5e0772f 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -920,13 +920,9 @@ local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx -- When socket is writeable, call onconnect local _sendbuffer = handler.sendbuffer; handler.sendbuffer = function () - _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ); handler.sendbuffer = _sendbuffer; listeners.onconnect(handler); - -- If there was data with the incoming packet, handle it now. - if #handler:bufferqueue() > 0 then - return _sendbuffer(); - end + return _sendbuffer(); -- Send any queued outgoing data end end end |