mirror of
https://github.com/bjc/prosody.git
synced 2025-04-01 20:27:39 +03:00
Merge 13.0->trunk
This commit is contained in:
commit
70ee43995c
3 changed files with 9 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue