Apply suggestions from code review

Co-authored-by: Miod Vallat <miod.vallat@powerdns.com>
Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/docs/settings.rst b/docs/settings.rst
index d38be36ca09b9ade64f0aa5600a9a84800e35655..00907053c83cb0b0742957bde25901b4e5561d6f 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -2257,7 +2257,7 @@ If the webserver should print arguments.
 
 .. _setting-webserver-cross-origin-request-header:
 
-``webserver-cross-origin-request_header``
+``webserver-cross-origin-request-header``
 -----------------------------------------
 .. versionadded:: 5.1.0
 

diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index 80c0725a988da0e8f8c9a2997b5f2acd03917961..17da153686284df9e83d3b5dd9f6c4d90237b2ca 100644 (file)
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -14,7 +14,7 @@ upgrade notes if your version is older than 3.4.2.
 Cross origin requests
 ^^^^^^^^^^^^^^^^^^^^^
 
-The embedded webserver now does not include a ``access-control-allow-origin: *`` header by default.
+The embedded webserver now no longer includes a ``access-control-allow-origin: *`` header by default.
 See :ref:`setting-webserver-cross-origin-request-header`.
 
 zone display

diff --git a/pdns/auth-main.cc b/pdns/auth-main.cc
index fb084c0af42ea5687d861db7ce985f492ced8ccb..4084740ecc65c7385aef080a605feee67c900d27 100644 (file)
--- a/pdns/auth-main.cc
+++ b/pdns/auth-main.cc
@@ -255,7 +255,7 @@ static void declareArguments()
   ::arg().set("webserver-max-concurrent-connections", "Webserver/API maximum concurrent connections allowed") = "100";
   ::arg().set("webserver-connection-timeout", "Webserver/API request/response timeout in seconds") = "5";
   ::arg().setSwitch("webserver-hash-plaintext-credentials", "Whether to hash passwords and api keys supplied in plaintext, to prevent keeping the plaintext version in memory at runtime") = "no";
-  ::arg().set("webserver-cross-origin-request_header", "Webserver cross origin request header value") = "";
+  ::arg().set("webserver-cross-origin-request-header", "Webserver cross origin request header value") = "";
 
   ::arg().setSwitch("query-logging", "Hint backends that queries should be logged") = "no";
 

diff --git a/pdns/recursordist/rec-rust-lib/table.py b/pdns/recursordist/rec-rust-lib/table.py
index 24673130e6fe5828dfdf8c600c039799cc67066d..9e571d8d74e5e9d6a698d2b14063d9f732de7f20 100644 (file)
--- a/pdns/recursordist/rec-rust-lib/table.py
+++ b/pdns/recursordist/rec-rust-lib/table.py
@@ -276,7 +276,7 @@ Static pre-shared authentication key for access to the REST API. Since 4.6.0 the
         "versionchanged": ("4.6.0", "This setting now accepts a hashed and salted version."),
     },
     {
-        "name": "cross_origin_request_heaer",
+        "name": "cross_origin_request_header",
         "section": "webservice",
         "type": LType.String,
         "default": "",