aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-08-26 21:50:08 +0200
committerKim Alvefur <zash@zash.se>2014-08-26 21:50:08 +0200
commitefdd626685a72db73f5f4de91bdb1963c7902d86 (patch)
tree2645318d1146e3b8ecc62128f9dd4a2e74413b3f
parent08d298926a6e28d059d20245bad69b10cb9af01d (diff)
downloadprosody-efdd626685a72db73f5f4de91bdb1963c7902d86.tar.gz
prosody-efdd626685a72db73f5f4de91bdb1963c7902d86.zip
mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double stream headers on policy failures
-rw-r--r--plugins/mod_s2s/mod_s2s.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index aa517bbd..d4864a38 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -362,7 +362,9 @@ function stream_callbacks.streamopened(session, attr)
log("debug", "Sending stream features: %s", tostring(features));
send(features);
end
+ session.notopen = nil;
elseif session.direction == "outgoing" then
+ session.notopen = nil;
-- If we are just using the connection for verifying dialback keys, we won't try and auth it
if not attr.id then error("stream response did not give us a streamid!!!"); end
session.streamid = attr.id;
@@ -396,7 +398,6 @@ function stream_callbacks.streamopened(session, attr)
end
end
end
- session.notopen = nil;
end
function stream_callbacks.streamclosed(session)