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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-02-22 22:29:53 +01:00
commit 5a3f0becf8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/prosodyctl/check.lua
View file

@ -341,8 +341,6 @@ local function check(arg)
local obsolete = set.new({ --> remove
"archive_cleanup_interval",
"cross_domain_bosh",
"cross_domain_websocket",
"dns_timeout",
"muc_log_cleanup_interval",
"s2s_dns_resolvers",
@ -375,6 +373,8 @@ local function check(arg)
registration_whitelist = instead_use("option", "registration_allowlist");
registration_blacklist = instead_use("option", "registration_blocklist");
blacklist_on_registration_throttle_overload = instead_use("blocklist_on_registration_throttle_overload");
cross_domain_bosh = "instead, use 'http_cors_override', see https://prosody.im/doc/http#cross-domain-cors-support";
cross_domain_websocket = "instead, use 'http_cors_override', see https://prosody.im/doc/http#cross-domain-cors-support";
};
-- FIXME all the singular _port and _interface options are supposed to be deprecated too
local deprecated_ports = { bosh = "http", legacy_ssl = "c2s_direct_tls" };