aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-13 21:56:22 +0200
committerKim Alvefur <zash@zash.se>2015-05-13 21:56:22 +0200
commit1d0034a91df7c8d68bcdaa9e5f37913795871191 (patch)
treebad1c3452932414ddeeb5519e9752c747afd7ec9
parentfc5eb1d219a207865e73ca313d8e4d29e1da2888 (diff)
downloadprosody-1d0034a91df7c8d68bcdaa9e5f37913795871191.tar.gz
prosody-1d0034a91df7c8d68bcdaa9e5f37913795871191.zip
mod_s2s: Mark stream as opened directly after opening stream, prevents session.close opening it again
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 1408fd5e..ee539a2a 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -349,6 +349,7 @@ function stream_callbacks.streamopened(session, attr)
end
session:open_stream(session.to_host, session.from_host)
+ session.notopen = nil;
if session.version >= 1.0 then
local features = st.stanza("stream:features");
@@ -361,7 +362,6 @@ function stream_callbacks.streamopened(session, attr)
log("debug", "Sending stream features: %s", tostring(features));
session.sends2s(features);
end
- session.notopen = nil;
elseif session.direction == "outgoing" then
session.notopen = nil;
if not attr.id then