diff options
author | Kim Alvefur <zash@zash.se> | 2014-08-26 21:50:08 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-08-26 21:50:08 +0200 |
commit | cab21484536575ca86ec6abdeb2f15833bf66840 (patch) | |
tree | 2645318d1146e3b8ecc62128f9dd4a2e74413b3f /plugins/mod_s2s | |
parent | 6c2e0aa22371dbb0ebf69cff3cd9c92fb5205733 (diff) | |
download | prosody-cab21484536575ca86ec6abdeb2f15833bf66840.tar.gz prosody-cab21484536575ca86ec6abdeb2f15833bf66840.zip |
mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double stream headers on policy failures
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 3 |
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) |