diff options
| author | Kim Alvefur <zash@zash.se> | 2025-02-22 21:49:59 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2025-02-22 21:49:59 +0100 |
| commit | 70ee43995c0e68306c8cdf867fc871edf637e82c (patch) | |
| tree | 08af9e145183053e338e954390d8b3854e6ec30f | |
| parent | 4537e07daa1c6f663375e8ec0b2ae44e84ecd4de (diff) | |
| parent | e52cc0126df37947718c18b590b682943ec6da16 (diff) | |
| download | prosody-70ee43995c0e68306c8cdf867fc871edf637e82c.tar.gz prosody-70ee43995c0e68306c8cdf867fc871edf637e82c.zip | |
Merge 13.0->trunk
| -rw-r--r-- | plugins/mod_bosh.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_component.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_websocket.lua | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index fc2c92ae..2d1b1922 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -558,7 +558,9 @@ function module.add_host(module) }; }); - module:depends("http_altconnect", true); + if module.host ~= "*" then + module:depends("http_altconnect", true); + end end if require"prosody.core.modulemanager".get_modules_for_host("*"):contains(module.name) then diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua index 86ceb980..51c73235 100644 --- a/plugins/mod_component.lua +++ b/plugins/mod_component.lua @@ -239,7 +239,9 @@ function stream_callbacks.handlestanza(session, stanza) end if not stanza.attr.to then session.log("warn", "Rejecting stanza with no 'to' address"); - session.send(st.error_reply(stanza, "modify", "bad-request", "Components MUST specify a 'to' address on stanzas")); + if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then + session.send(st.error_reply(stanza, "modify", "bad-request", "Components MUST specify a 'to' address on stanzas")); + end return; end end diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua index dfc1a215..206ad678 100644 --- a/plugins/mod_websocket.lua +++ b/plugins/mod_websocket.lua @@ -367,7 +367,9 @@ function module.add_host(module) }; }); - module:depends("http_altconnect", true); + if module.host ~= "*" then + module:depends("http_altconnect", true); + end module:hook("c2s-read-timeout", keepalive, -0.9); end |