diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-07-25 13:54:47 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-07-25 13:54:47 +0100 |
| commit | bea4ac8461451a6d8709463c590b13ae9b94f7a3 (patch) | |
| tree | b398e0fb55f0e7a8fac8e78ef9ab82d6837e2f7e /net | |
| parent | 53a3acbd83208942350577bbe2666c0cd63f3459 (diff) | |
| parent | 302c40a40db05cafad981fd5565e0c8281d8919f (diff) | |
| download | prosody-bea4ac8461451a6d8709463c590b13ae9b94f7a3.tar.gz prosody-bea4ac8461451a6d8709463c590b13ae9b94f7a3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_event.lua | 1 | ||||
| -rw-r--r-- | net/server_select.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index b79fc463..52c1e9c1 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -840,6 +840,7 @@ local function link(sender, receiver, buffersize) sender:pause(); end end + sender:set_mode("*a"); end return { diff --git a/net/server_select.lua b/net/server_select.lua index 0aaea4be..06deec32 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -710,6 +710,7 @@ local function link(sender, receiver, buffersize) sender:lock_read(true); end end + sender:set_mode("*a"); end ----------------------------------// PUBLIC //-- |