aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-10 16:55:14 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-10 16:55:14 +0000
commit59f7814f5fdf47d1a7dd673043cbc076b0484f66 (patch)
treeabbbbb157d87d9b42cd07cf59bb1106966983082 /core
parentf8d8e7174c21883b0cd2dfc5c6609a034cb7c403 (diff)
parent2da3143c9dbbf47e96677cdbd3c55c558c61ea53 (diff)
downloadprosody-59f7814f5fdf47d1a7dd673043cbc076b0484f66.tar.gz
prosody-59f7814f5fdf47d1a7dd673043cbc076b0484f66.zip
Merge 0.8->trunk
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 7e6f8135..df201e9e 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -71,8 +71,7 @@ local function bounce_sendq(session, reason)
};
for i, data in ipairs(sendq) do
local reply = data[2];
- local xmlns = reply.attr.xmlns;
- if not(xmlns) and bouncy_stanzas[reply.name] then
+ if reply and not(reply.attr.xmlns) and bouncy_stanzas[reply.name] then
reply.attr.type = "error";
reply:tag("error", {type = "cancel"})
:tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
@@ -99,8 +98,8 @@ function send_to_host(from_host, to_host, data)
(host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
-- Queue stanza until we are able to send it
- if host.sendq then t_insert(host.sendq, {tostring(data), st.reply(data)});
- else host.sendq = { {tostring(data), st.reply(data)} }; end
+ if host.sendq then t_insert(host.sendq, {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)});
+ else host.sendq = { {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)} }; end
host.log("debug", "stanza [%s] queued ", data.name);
elseif host.type == "local" or host.type == "component" then
log("error", "Trying to send a stanza to ourselves??")
@@ -122,7 +121,7 @@ function send_to_host(from_host, to_host, data)
local host_session = new_outgoing(from_host, to_host);
-- Store in buffer
- host_session.sendq = { {tostring(data), st.reply(data)} };
+ host_session.sendq = { {tostring(data), data.attr.type ~= "error" and data.attr.type ~= "result" and st.reply(data)} };
log("debug", "stanza [%s] queued until connection complete", tostring(data.name));
if (not host_session.connecting) and (not host_session.conn) then
log("warn", "Connection to %s failed already, destroying session...", to_host);