From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 21 Apr 2021 13:13:30 +0000 (+0200)
Subject: Add CHANGES and release notes for [GL #2478]
X-Git-Tag: v9.17.17~43^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29843bcde87434bd374cdedcf8fdb5c634505731;p=thirdparty%2Fbind9.git

Add CHANGES and release notes for [GL #2478]
---

diff --git a/CHANGES b/CHANGES
index 23d9d1dbb53..507ab6b9614 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5673.	[func]		Add "--disable-doh" configuration option to allow
+			BIND 9 to compile without libnghttp2 library.
+			[GL #2478]
+
 5672.	[bug]		Authentication of rndc messages could fail if a
 			"controls" statement was configured with multiple
 			key algorithms in the same listener. [GL #2756]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 7a7700bb070..0ef55db54c7 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -47,6 +47,10 @@ Feature Changes
   ``named`` now sends back empty DNS messages with the TC (TrunCated) bit set,
   forcing the DNS client to fall back to TCP.  :gl:`#2790`
 
+- DNS over HTTPS support can be disabled at the compile time via the new
+  configuration option ``--disable-doh``.  This allows BIND 9 to be
+  compiled without libnghttp2 library. [GL #2478]
+
 Bug Fixes
 ~~~~~~~~~