Mercurial > prosody-hg
comparison net/server_select.lua @ 3010:52146b82f295
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 05 May 2010 17:22:43 +0100 |
| parents | 9d122a6ae674 23915803adbf |
| children | bf3c4195c5f8 |
comparison
equal
deleted
inserted
replaced
| 3007:9d122a6ae674 | 3010:52146b82f295 |
|---|---|
| 630 _sendlistlen = addsocket(_sendlist, socket, _sendlistlen) | 630 _sendlistlen = addsocket(_sendlist, socket, _sendlistlen) |
| 631 handler.sendbuffer = function () | 631 handler.sendbuffer = function () |
| 632 listeners.onconnect(handler); | 632 listeners.onconnect(handler); |
| 633 handler.sendbuffer = _sendbuffer; | 633 handler.sendbuffer = _sendbuffer; |
| 634 if bufferqueuelen > 0 then | 634 if bufferqueuelen > 0 then |
| 635 return _senddbuffer(); | 635 return _sendbuffer(); |
| 636 end | 636 end |
| 637 end | 637 end |
| 638 end | 638 end |
| 639 return handler, socket | 639 return handler, socket |
| 640 end | 640 end |