Add notes and changes for [#2594]

Pretty newsworthy.

diff --git a/CHANGES b/CHANGES
index 2093d52eb8e4b64ea0b12151e43257da9e1bd1ce..e446dd9a41a567ee6b6bb54aa99c28c204942656 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+5610.  [bug]           Prevent a crash which could happen when a lookup
+                       triggered by "stale-answer-client-timeout" was attempted
+                       right after recursion for a client query finished.
+                       [GL #2594]
+
 5609.  [func]          GSSAPI support no longer uses the ISC SPNEGO
                        implementation. [GL #2607]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index c43b733c9dc66119a9e8f1543a9011bd60cb08df..1758bbdd47993b643ca1d989fe16712dc5441cd5 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -64,4 +64,9 @@ Bug Fixes
   which could cause a large zone transfer to be sent back to the client. The
   default setting for ``tcp-initial-timeout`` was 30 seconds, which meant that
   any TCP connection taking more than 30 seconds was abruptly terminated. This
-  has been fixed [GL #2573].
+  has been fixed. [GL #2573]
+
+- When ``stale-answer-client-timeout`` was set to a positive value and
+  recursion for a client query completed when ``named`` was about to look for
+  a stale answer, an assertion could fail in ``query_respond()``, resulting in
+  a crash. This has been fixed. [GL #2594]