aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2022-07-11 17:32:13 +0200
committerKim Alvefur <zash@zash.se>2022-07-11 17:32:13 +0200
commitd055a704d84e5a0ddbd0e31c7a8e19ef75a49952 (patch)
treefe97ff60881b74d80acc3186f817f005d2bb2bbf /core
parent561c588fd5e2624f8c2f3e6bfacad562a728f60f (diff)
parent814817ebf21306625268dbacba88eb4f539b1626 (diff)
downloadprosody-d055a704d84e5a0ddbd0e31c7a8e19ef75a49952.tar.gz
prosody-d055a704d84e5a0ddbd0e31c7a8e19ef75a49952.zip
Merge 0.12->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 b683e9ca..b9190993 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -94,7 +94,7 @@ local function destroy_session(session, reason, bounce_reason)
hosts[session.from_host].s2sout[session.to_host] = nil;
session:bounce_sendq(bounce_reason or reason);
elseif session.direction == "incoming" then
- if session.outgoing then
+ if session.outgoing and hosts[session.to_host].s2sout[session.from_host] == session then
hosts[session.to_host].s2sout[session.from_host] = nil;
end
incoming_s2s[session] = nil;