diff options
-rw-r--r-- | plugins/mod_bosh.lua | 4 | ||||
-rw-r--r-- | plugins/mod_component.lua | 4 | ||||
-rw-r--r-- | plugins/mod_websocket.lua | 4 | ||||
-rw-r--r-- | util/prosodyctl/check.lua | 1 |
4 files changed, 10 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 diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua index 4ac7af9e..554a64ef 100644 --- a/util/prosodyctl/check.lua +++ b/util/prosodyctl/check.lua @@ -1631,6 +1631,7 @@ local function check(arg) }); end end + break; end end if not found then |