Mercurial > prosody-hg
comparison net/server_event.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 |
|---|---|
| 848 if receiver.writebufferlen >= buffersize then | 848 if receiver.writebufferlen >= buffersize then |
| 849 sender_locked = true; | 849 sender_locked = true; |
| 850 sender:pause(); | 850 sender:pause(); |
| 851 end | 851 end |
| 852 end | 852 end |
| 853 sender:set_mode("*a"); | |
| 853 end | 854 end |
| 854 | 855 |
| 855 return { | 856 return { |
| 856 | 857 |
| 857 cfg = cfg, | 858 cfg = cfg, |
