Sync CHANGES entries [skip ci]

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

diff --git a/CHANGES b/CHANGES
index 092ec73e7f749c97190907fc01903b4d486fee9b..42c30d6106a75697fdae0b7246b39abb683bc1f3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,15 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.53
 
+  * mod_md) do not interfere with requests to /.well-known/acme-challenge/
+    resources if challenge type 'http-01' is not configured for a domain.
+    Fixes <https://github.com/icing/mod_md/issues/279>.
+    [Stefan Eissing]
+
+  *) mod_dav: Fix regression when gathering properties which could lead to huge
+     memory consumption proportional to the number of resources.
+     [Evgeny Kotkov, Ruediger Pluem]
+
   *) Support pcre2 (10.x) library in place of the now end-of-life pcre (8.x)
      for regular expression evaluation. This depends on locating pcre2-config.
      [William Rowe, Petr Pisar <ppisar redhat.com>, Rainer Jung]

diff --git a/changes-entries/md_ignore_http_challenges.txt b/changes-entries/md_ignore_http_challenges.txt
deleted file mode 100644 (file)
index e13b7a2..0000000
--- a/changes-entries/md_ignore_http_challenges.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  * mod_md) do not interfere with requests to /.well-known/acme-challenge/
-    resources if challenge type 'http-01' is not configured for a domain.
-    Fixes <https://github.com/icing/mod_md/issues/279>.
-    [Stefan Eissing]

diff --git a/changes-entries/mod_dav_memory_regresssion.txt b/changes-entries/mod_dav_memory_regresssion.txt
deleted file mode 100644 (file)
index 65b50c5..0000000
--- a/changes-entries/mod_dav_memory_regresssion.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_dav: Fix regression when gathering properties which could lead to huge
-     memory consumption proportional to the number of resources.
-     [Evgeny Kotkov, Ruediger Pluem]