Add CHANGES and release notes for GL #1712 and GL #1829

diff --git a/CHANGES b/CHANGES
index b54bd83a2a1e9e0ae7abebc78ee6164b265853e5..40b003e47273a778350af817b1a3e4d6e1fbe79b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+5484.  [func]          Expire the 0 TTL RRSet quickly rather using them for
+                       stale answers. [GL #1829]
+
+5483.  [func]          Keeping "stale" answers in cache has been disabled by
+                       default and can be re-enabled with a new configuration
+                       option "stale-cache-enable". [GL #1712]
+
 5482.  [bug]           BIND 9 would fail to bind to IPv6 addresses in a
                        tentative state when a new IPv6 address was added to the
                        system, but the Duplicate Address Detection (DAD)

diff --git a/bin/named/server.c b/bin/named/server.c
index 82179cdeb83244300123d06ce7a2d993ab35e892..88726bb4c7d3fbc8cb156977ce34d004bdce6e36 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -4366,6 +4366,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
                INSIST(result == ISC_R_SUCCESS);
                max_stale_ttl = ISC_MAX(cfg_obj_asduration(obj), 1);
        }
+       /*
+        * If 'stale-cache-enable' is false, max_stale_ttl is set to 0,
+        * meaning keeping stale RRsets in cache is disabled.
+        */
 
        obj = NULL;
        result = named_config_get(maps, "stale-answer-enable", &obj);

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0480bcbf6b7b3686e1fb063dced51ace17bdfa6c..3ee01476ab55bca5d137cb703aa7719e884e9301 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -36,6 +36,9 @@ New Features
 - Statistics channels have also been updated to use the new BIND network
   manager API. [GL #2022]
 
+- A new configuration option ``stale-cache-enable`` has been introduced to
+  enable or disable the keeping of stale answers in cache. [GL #1712]
+
 Feature Changes
 ~~~~~~~~~~~~~~~
 
@@ -46,6 +49,11 @@ Feature Changes
   prevents interruption to query resolution when the hash tables need to be
   increased in size. [GL #1775]
 
+- Keeping stale answers in cache has been disabled by default.
+
+- The resource records received with 0 TTL are no longer kept in the cache
+  to be used for stale answers. [GL #1829]
+
 Bug Fixes
 ~~~~~~~~~