aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-02-22 22:29:53 +0100
committerKim Alvefur <zash@zash.se>2023-02-22 22:29:53 +0100
commit5a3f0becf8a923cd21b5c6bc52b496b6e4b38179 (patch)
tree49a0ce2fb9792a83ff7181af19d60ce1e159af09
parentc368ddc00775eb16d88517352b6676cc544e134a (diff)
parent9c49ca70fd5e0916c694b3153631682f3fd192da (diff)
downloadprosody-5a3f0becf8a923cd21b5c6bc52b496b6e4b38179.tar.gz
prosody-5a3f0becf8a923cd21b5c6bc52b496b6e4b38179.zip
Merge 0.12->trunk
-rw-r--r--util/prosodyctl/check.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua
index c1cf5ad1..793ef038 100644
--- a/util/prosodyctl/check.lua
+++ b/util/prosodyctl/check.lua
@@ -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" };