Software / code / prosody
Changeset
12680:ca4abc6ab208
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 26 Aug 2022 19:03:23 +0200 |
| parents | 12678:5a61e1603f42 (current diff) 12679:7d4a95ba9b6c (diff) |
| children | 12681:16ea01745dbe |
| files | plugins/mod_s2s.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_s2s.lua Fri Aug 26 17:28:06 2022 +0100 +++ b/plugins/mod_s2s.lua Fri Aug 26 19:03:23 2022 +0200 @@ -460,6 +460,7 @@ 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 @@ 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
