Add CHANGES and notes for [#2733]

diff --git a/CHANGES b/CHANGES
index 143512c9bb0f73479c74d9248e332fc1c0747249..2838b49b5b6232571acb8cfc866750a4ee5ddf29 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5650.  [bug]           Prevent a crash that could occur if serve-stale
+                       was enabled and a prefetch was triggered during a
+                       query restart. [GL #2733]
+
 5649.  [bug]           If a query was answered with stale data on a server
                        with DNS64 enabled, an assertion could occur if a
                        non-stale answer arrived afterward. [GL #2731]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 24d0bdd01abd941b065d7edee8fdcade6ad50d6f..04f1e8db86ef354350b1c511d942cfb69882fa5a 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -65,3 +65,7 @@ Bug Fixes
 - If a query was answered with stale data on a server with DNS64 enabled,
   an assertion could occur if a non-stale answer arrived afterward. This
   has been fixed. :gl:`#2731`
+
+- Fixed an assertion failure that could occur if stale data was used
+  to answer a query, and then a prefetch was triggered after the query
+  was restarted (for example, to follow a CNAME). :gl:`#2733`