From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 1 Dec 2020 18:01:30 +0000 (+0100)
Subject: Add CHANGES and release not for GL #2250
X-Git-Tag: v9.16.10~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d35c9b96d64ed632bac28a70bb2bc12b9be6457;p=thirdparty%2Fbind9.git

Add CHANGES and release not for GL #2250

(cherry picked from commit c7d81f12f820beecebaeab184afc8df57e4f9a76)
---

diff --git a/CHANGES b/CHANGES
index 524e0731ebe..a8a7d9e18ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5544.	[func]		Restore the default value of nocookie-udp-size to 4096.
+			[GL #2250]
+
 5541.	[func]		Adjust the "max-recursion-queries" default from 75 to
 			100. [GL #2305]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 89c3d027d8d..f3d238eba00 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -46,6 +46,14 @@ Feature Changes
   has a higher chance of being exceeded by non-attack queries, which is the
   main reason for increasing its default value. [GL #2305]
 
+- Restore the ``nocookie-udp-size`` default from 1232 to 4096. Normally the
+  EDNS buffer size is configured by ``max-udp-size``, but this configuration
+  option overrides the value, but most people don't and won't realize there's
+  an extra configuration option that needs to be tweaked. By changing the
+  default here, we allow the the ``max-udp-size`` to be the sole option that
+  needs to be changed when operator wants to change the default EDNS buffer
+  size. [GL #2250]
+
 Bug Fixes
 ~~~~~~~~~