Mercurial > prosody-hg
comparison net/server_select.lua @ 6315:7a3e2f2d43fc
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:27 +0100 |
| parents | 7a5ddbaf758d 8029b8a5f37a |
| children | e144a1b67c30 57d23c26039b |
comparison
equal
deleted
inserted
replaced
| 6312:1940a014aeca | 6315:7a3e2f2d43fc |
|---|---|
| 707 if not sender_locked and receiver.bufferlen() >= buffersize then | 707 if not sender_locked and receiver.bufferlen() >= buffersize then |
| 708 sender_locked = true; | 708 sender_locked = true; |
| 709 sender:lock_read(true); | 709 sender:lock_read(true); |
| 710 end | 710 end |
| 711 end | 711 end |
| 712 sender:set_mode("*a"); | |
| 712 end | 713 end |
| 713 | 714 |
| 714 ----------------------------------// PUBLIC //-- | 715 ----------------------------------// PUBLIC //-- |
| 715 | 716 |
| 716 addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server | 717 addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server |
