aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-14 00:22:56 +0200
committerKim Alvefur <zash@zash.se>2015-05-14 00:22:56 +0200
commit26b55b19d692b66c9f09a933c419641af863e94a (patch)
tree138caf13843596c4aaf96f61da26a2da69fa8ea2 /core
parent6e1bf7233685953e586445fc812c84927b6ae990 (diff)
parenta1856627f59745d91f4960afedbe95c6113f2b95 (diff)
downloadprosody-26b55b19d692b66c9f09a933c419641af863e94a.tar.gz
prosody-26b55b19d692b66c9f09a933c419641af863e94a.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
-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