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
commitcdd56ed7e4bf4ecf35f69fe95beba4e2b3bafc5d (patch)
tree16c5df7729d17c0c28bf2ab297165a26c3d27370 /core
parent2efe13082cc309ae3247aa4482f87cccff1acdef (diff)
parentc6ddf7f4ee8c5ab170f454c1b57b708897c79d2e (diff)
downloadprosody-cdd56ed7e4bf4ecf35f69fe95beba4e2b3bafc5d.tar.gz
prosody-cdd56ed7e4bf4ecf35f69fe95beba4e2b3bafc5d.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);