aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:47 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:47 +0100
commit132c641c95e07ebc28d346a503fc59085c881f6b (patch)
treeb398e0fb55f0e7a8fac8e78ef9ab82d6837e2f7e
parent8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516 (diff)
parent713c007fc2b3dc18e86a57f73b86e814868259db (diff)
downloadprosody-132c641c95e07ebc28d346a503fc59085c881f6b.tar.gz
prosody-132c641c95e07ebc28d346a503fc59085c881f6b.zip
Merge 0.10->trunk
-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 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 //--