From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 22 Jul 2021 17:38:27 +0000 (+0000)
Subject: Update CHANGES [skip ci].
X-Git-Tag: candidate-2.4.49~3^2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33846f8ca4f14b8243f70f86fe6a1d0ecbed7351;p=thirdparty%2Fapache%2Fhttpd.git

Update CHANGES [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1891731 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 3920c6a4c3f..515189f2ea6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.49
 
+  *) mod_md: fixed a potential null pointer dereference if ACME/OCSP
+     server returned 2xx responses without content type. Reported by chuangwen.
+     [chuangwen, Stefan Eissing]
+
+  *) mod_md:
+     - Domain names in `<MDomain ...>` can now appear in quoted form.
+     - Fixed a failure in ACME challenge selection that aborted further searches
+       when the tls-alpn-01 method did not seem to be suitable.
+     - Changed the tls-alpn-01 setup to only become unsuitable when none of the
+       dns names showed support for a configured 'Protocols ... acme-tls/1'. This
+       allows use of tls-alpn-01 for dns names that are not mapped to a VirtualHost.
+     [Stefan Eissing]
+
   *) Add CPING to health check logic. [Jean-Frederic Clere]
 
   *) core: Split ap_create_request() from ap_read_request(). [Graham Leggett]
diff --git a/changes-entries/md_2_4_4_fixes.txt b/changes-entries/md_2_4_4_fixes.txt
deleted file mode 100644
index 7ae03c9af3a..00000000000
--- a/changes-entries/md_2_4_4_fixes.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-  *) mod_md:
-     - Domain names in `<MDomain ...>` can now appear in quoted form.
-     - Fixed a failure in ACME challenge selection that aborted further searches
-       when the tls-alpn-01 method did not seem to be suitable.
-     - Changed the tls-alpn-01 setup to only become unsuitable when none of the
-       dns names showed support for a configured 'Protocols ... acme-tls/1'. This
-       allows use of tls-alpn-01 for dns names that are not mapped to a VirtualHost.
-     [Stefan Eissing]
diff --git a/changes-entries/md_fix_potential_nullpointer.txt b/changes-entries/md_fix_potential_nullpointer.txt
deleted file mode 100644
index f7c3e2d556a..00000000000
--- a/changes-entries/md_fix_potential_nullpointer.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_md: fixed a potential null pointer dereference if ACME/OCSP
-     server returned 2xx responses without content type. Reported by chuangwen.
-     [chuangwen, Stefan Eissing]