Comments and docs tweaks

diff --git a/pdns/recursordist/docs/manpages/rec_control.1.rst b/pdns/recursordist/docs/manpages/rec_control.1.rst
index 3f63486704e6cf4b1ba0880a29466102c6735ba3..921fe4a9f19dea5a40ba7990c977b0a48e59a6a0 100644 (file)
--- a/pdns/recursordist/docs/manpages/rec_control.1.rst
+++ b/pdns/recursordist/docs/manpages/rec_control.1.rst
@@ -94,6 +94,9 @@ dump-cache *FILENAME* [*TYPE*...]
     select specific caches specify one or more *TYPE*s, separated
     by spaces. The value of *TYPE* can be r, n, p or a.
 
+dump-cookies *FILENAME*
+    Dump the cookie store.
+
 dump-dot-probe-map *FILENAME*
     Dump the contents of the DoT probe map to the *FILENAME* mentioned.
 

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 902cfffd0df11d5dec60f4a2ca48ee9518138c39..79637b97066c6f7bba2f37ff4285255dba187c11 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -4,6 +4,20 @@ Upgrade Guide
 Before upgrading, it is advised to read the :doc:`changelog/index`.
 When upgrading several versions, please read **all** notes applying to the upgrade.
 
+5.3.0 to master
+---------------
+
+New Settings
+^^^^^^^^^^^^
+
+- The :ref:`setting-yaml-outgoing.cookies` settings has been introduced to implement cookie support for contacting authoritative servers and forwarders. See :rfc:`7873` and :rfc:`9018`.
+
+:program:`rec_control`
+^^^^^^^^^^^^^^^^^^^^^^
+
+The ``dump-cookies`` subcommand has been added to dump a table showing cookie support for each
+authoritative server contacted recently.
+
 5.2.0 to 5.3.0
 --------------
 

diff --git a/pdns/recursordist/rec-cookiestore.hh b/pdns/recursordist/rec-cookiestore.hh
index 72765e4f3be79223acd9156759582d1be8b1d4a9..aa511ddd33f447a25853286e40fd3cf327588461 100644 (file)
--- a/pdns/recursordist/rec-cookiestore.hh
+++ b/pdns/recursordist/rec-cookiestore.hh
@@ -28,13 +28,13 @@
   - Cookies are stored with an auth IP address as primary index and are generated randomly.
 
   - If the the does not support cookies, this is marked as such and no cookies will be sent to it
-  for a period of time. When a cookie is sent again, it must be a newly generated one.
+    for a period of time. When a cookie is sent again, it must be a newly generated one.
 
-  - A cookie is stored together with the client IP (as rec can have many). If a server is to be
+  - A cookie is stored together with the local IP (as rec can have many). If a server is to be
     contacted again, it should use the same bound IP.
 
- - Although it is perfectly fine for a client cookie to live for a long time, this design will
-   flush entries older that a certain period of time, to avoid an ever growing CookieStore.
+  - Although it is perfectly fine for a client cookie to live for a long time, this design will
+    flush entries older that a certain period of time, to avoid an ever growing CookieStore.
 
 */