aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-08-26 23:57:12 +0100
committerMatthew Wild <mwild1@gmail.com>2012-08-26 23:57:12 +0100
commit1cda3e3bd186eea68a8b12e6fc3d7a93aeb929b5 (patch)
tree16c5df7729d17c0c28bf2ab297165a26c3d27370 /core
parent2ce7b8b4e10dc3ecf9b97f2b00cb33a905167d79 (diff)
parentd4e080f745645d308e0eeb9cfd6386313a45617e (diff)
downloadprosody-1cda3e3bd186eea68a8b12e6fc3d7a93aeb929b5.tar.gz
prosody-1cda3e3bd186eea68a8b12e6fc3d7a93aeb929b5.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 76dde9d2..4c018713 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -96,7 +96,7 @@ function mark_connected(session)
else
local host_session = hosts[to];
session.send = function(stanza)
- host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
+ return host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
end;
prosody.events.fire_event("s2sin-established", event_data);