make update-changes prior to backports

[skip ci]

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

diff --git a/CHANGES b/CHANGES
index d678a303c87597adf53d98bd6bdf2ad721205440..27317a3ade67f6766c08992ebb7b20aa209fb29b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,17 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.55
 
+  *) mod_md: a new directive `MDStoreLocks` can be used on cluster
+     setups with a shared file system for `MDStoreDir` to order
+     activation of renewed certificates when several cluster nodes are
+     restarted at the same time. Store locks are not enabled by default.
+     Restored curl_easy cleanup behaviour from v2.4.14 and refactored
+     the use of curl_multi for OCSP requests to work with that.
+     Fixes <https://github.com/icing/mod_md/issues/293>.
+
+  *) core: Avoid an overflow on large inputs in ap_is_matchexp.  PR 66033
+     [Ruediger Pluem]
+
   *) mod_heartmonitor: Allow "HeartbeatMaxServers 0" to use file based
      storage instead of slotmem. Needed after setting
      HeartbeatMaxServers default to the documented value 10 in 2.4.54.

diff --git a/changes-entries/md_locks_and_fix.txt b/changes-entries/md_locks_and_fix.txt
deleted file mode 100644 (file)
index c70ef1f..0000000
--- a/changes-entries/md_locks_and_fix.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-  *) mod_md: a new directive `MDStoreLocks` can be used on cluster
-     setups with a shared file system for `MDStoreDir` to order
-     activation of renewed certificates when several cluster nodes are
-     restarted at the same time. Store locks are not enabled by default.
-
-     Restored curl_easy cleanup behaviour from v2.4.14 and refactored
-     the use of curl_multi for OCSP requests to work with that.
-     Fixes <https://github.com/icing/mod_md/issues/293>.

diff --git a/changes-entries/pr66033.txt b/changes-entries/pr66033.txt
deleted file mode 100644 (file)
index caa98d1..0000000
--- a/changes-entries/pr66033.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) core: Avoid an overflow on large inputs in ap_is_matchexp.  PR 66033
-     [Ruediger Pluem]