Prep for rec-4.6.0-beta1

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index 7bb94cbdee1db4559a884df96a8e38395e448ad4..e8f76f5edb0f1bb8989a2ab7290ca006fd4c8143 100644 (file)
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -1,4 +1,4 @@
-@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021110500 10800 3600 604800 10800
+@       86400   IN  SOA pdns-public-ns1.powerdns.com. pieter\.lexis.powerdns.com. 2021110901 10800 3600 604800 10800
 @       3600    IN  NS  pdns-public-ns1.powerdns.com.
 @       3600    IN  NS  pdns-public-ns2.powerdns.com.
 
@@ -279,6 +279,7 @@ recursor-4.5.6.security-status                          60 IN TXT "1 OK"
 recursor-4.5.7.security-status                          60 IN TXT "1 OK"
 recursor-4.6.0-alpha1.security-status                   60 IN TXT "1 Unsupported pre-release"
 recursor-4.6.0-alpha2.security-status                   60 IN TXT "1 Unsupported pre-release"
+recursor-4.6.0-beta1.security-status                    60 IN TXT "1 Unsupported pre-release"
 
 ; Recursor Debian
 recursor-3.6.2-2.debian.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"

diff --git a/pdns/recursordist/docs/changelog/4.6.rst b/pdns/recursordist/docs/changelog/4.6.rst
index 14e94cf7aa9ab1a427510b18a22e7d2ec9a18709..4ff5b16dd7855d778d4a18b915dac44dd76eb55f 100644 (file)
--- a/pdns/recursordist/docs/changelog/4.6.rst
+++ b/pdns/recursordist/docs/changelog/4.6.rst
@@ -1,6 +1,54 @@
 Changelogs for 4.6.X
 ====================
 
+.. changelog::
+  :version: 4.6.0-beta1
+  :released: 9th of November 2021
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10865
+
+    Return documented reply on /api/v1 access.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 10943
+    :tickets: 10938
+
+    Credentials: EVP_PKEY_CTX_set1_scrypt_salt() takes an `unsigned char*`.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10919
+    :tickets: 10852
+
+    Add more UDP error metrics (checksum, IPv6).
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10930,10965
+
+    Move to a stream based socket for the control channel.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10901
+
+    ZoneParserTNG: Stricter checks when loading a zone file.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 10926
+
+    Fix regression of carbon-ourname.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 10891
+
+    Implement fd-usage metric for OpenBSD.
+
 .. changelog::
   :version: 4.6.0-alpha2
   :released: 25th of October 2021

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index 804436da57304777fec9836e76f366edbc5c0add..ab86fa5db25cc232f9ba8a5340a4208d46033f11 100644 (file)
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -1044,6 +1044,8 @@ Maximum number of incoming requests handled concurrently per tcp
 connection. This number must be larger than 0 and smaller than 65536
 and also smaller than `max-mthreads`.
 
+.. versionadded:: 4.6.0
+
 .. _setting-max-include-depth:
 
 ``max-include-depth``

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index a338f88f19ee035184e81e0caaf1453bd411b79e..6cdd9d6848cdd13988e03e05038dc2bd150cdbd3 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -19,6 +19,7 @@ New settings
 - The :ref:`setting-webserver-hash-plaintext-credentials` has been introduced to avoid keeping cleartext sensitive information in memory.
 - The :ref:`setting-tcp-out-max-idle-ms`, :ref:`setting-tcp-out-max-idle-per-auth`, :ref:`setting-tcp-out-max-queries` and :ref:`setting-tcp-out-max-idle-per-thread` settings have been introduced to control the new TCP/DoT outgoing connections pooling. This mechanism keeps connections to authoritative servers or forwarders open for later re-use.
 - The :ref:`setting-structured-logging` setting has been introduced to prefer structured logging (the default) when both an old style and a structured log messages is available.
+- The :ref:`setting-max-include-depth` setting has been introduced to limit the number of nested ``$include`` directives while processing a zone file.
 
 Deprecated and changed settings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^