Mercurial > prosody-hg
comparison net/server_event.lua @ 6316:e144a1b67c30
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:54:47 +0100 |
| parents | ec6e8d5a3fd3 7a3e2f2d43fc |
| children | ec8878113907 |
comparison
equal
deleted
inserted
replaced
| 6313:8bd486b6e5ec | 6316:e144a1b67c30 |
|---|---|
| 838 if receiver.writebufferlen >= buffersize then | 838 if receiver.writebufferlen >= buffersize then |
| 839 sender_locked = true; | 839 sender_locked = true; |
| 840 sender:pause(); | 840 sender:pause(); |
| 841 end | 841 end |
| 842 end | 842 end |
| 843 sender:set_mode("*a"); | |
| 843 end | 844 end |
| 844 | 845 |
| 845 return { | 846 return { |
| 846 | 847 |
| 847 cfg = cfg, | 848 cfg = cfg, |
