mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2022-08-26 19:03:23 +02:00
commit de4b0b6de2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_s2s.lua
View file

@ -460,6 +460,7 @@ function stream_callbacks._streamopened(session, attr)
end
if session.type == "s2sin_unauthed" and to and not session.to_host then
session.to_host = to;
session.host = to;
elseif to ~= session.to_host then
session:close({ condition = "improper-addressing", text = "New stream 'to' attribute does not match original" });
return;
@ -885,8 +886,7 @@ end
function listener.onreadtimeout(conn)
local session = sessions[conn];
if session then
local host = session.host or session.to_host;
return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session });
return (hosts[session.host] or prosody).events.fire_event("s2s-read-timeout", { session = session });
end
end