Add release note and changes for #3950

Fixing another serve-stale bug is still news.

(cherry picked from commit 23dbb6ba72c9c5cce6f703d44dc6eaed2005c982)

diff --git a/CHANGES b/CHANGES
index 2d4333418bcc4be52d342cf1c068f837003fe6a6..1d225c08ee7a3fe4370ce72bc9b6f8a0e6d2a28d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6183.  [bug]           Fix a serve-stale bug where a delegation from cache
+                       could be returned to the client. [GL #3950]
+
 6173.  [bug]           Properly process extra "nameserver" lines in
                        resolv.conf otherwise the next line is not properly
                        processed. [GL #4066]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index f3191f9b2dbc6155734a0c4577c4889a4d0c85e9..1cd8c68f6f68d7f79506b07c7d0c3316c521c175 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -35,7 +35,9 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- It could happen that after the ``stale-answer-client-timeout`` duration,
+  a delegation from cache was returned to the client. This has now been fixed.
+  :gl:`#3950`
 
 Known Issues
 ~~~~~~~~~~~~