aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-14 00:24:21 +0200
committerKim Alvefur <zash@zash.se>2015-05-14 00:24:21 +0200
commit217aae0531fa09e57d3b324816da793a72655047 (patch)
tree887ef8ce4128251eb52ba5753584e8262a89d492
parent539f4b561436344e095cc945afe6301edf272250 (diff)
parent9f6130ddaa3ebb231f617261c0f325a8d4bc29d7 (diff)
downloadprosody-217aae0531fa09e57d3b324816da793a72655047.tar.gz
prosody-217aae0531fa09e57d3b324816da793a72655047.zip
Merge 0.10->trunk
-rw-r--r--core/s2smanager.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index a3a8702a..b6516393 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -64,6 +64,7 @@ function retire_session(session, reason)
function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end
function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end
+ session.sends2s = session.send;
return setmetatable(session, resting_session);
end