aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:27 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:27 +0100
commit713c007fc2b3dc18e86a57f73b86e814868259db (patch)
tree2bf143aa85236f3dfda8d62425b70811ae9e49e2 /net
parent999a5a0cb3e13f5922d5c64418162ff463f1abd7 (diff)
parent57a4449fce2eb01d7b5b1537c15a2f3e144f8472 (diff)
downloadprosody-713c007fc2b3dc18e86a57f73b86e814868259db.tar.gz
prosody-713c007fc2b3dc18e86a57f73b86e814868259db.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua1
-rw-r--r--net/server_select.lua1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 53330997..e10606dd 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -850,6 +850,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 daad0f50..6308e62f 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -709,6 +709,7 @@ local function link(sender, receiver, buffersize)
sender:lock_read(true);
end
end
+ sender:set_mode("*a");
end
----------------------------------// PUBLIC //--