Sync CHANGES entries [skip ci].

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

diff --git a/CHANGES b/CHANGES
index ff7a27f568d4a5e129bd9117cca96e06e008ad5a..e1bc5d8ecbdb27938709e822e544a7338132399e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,21 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.54
 
+  *) mod_md: the `MDCertificateAuthority` directive can take more than one URL/name of
+     an ACME CA. This gives a failover for renewals when several consecutive attempts
+     to get a certificate failed.
+     A new directive was added: `MDRetryDelay` sets the delay of retries.
+     A new directive was added: `MDRetryFailover` sets the number of errored
+     attempts before an alternate CA is selected for certificate renewals.
+     [Stefan Eissing]
+
+  *) mod_http2: remove unused and insecure code. Fixes PR66037.
+     Thanks to Ronald Crane (Zippenhop LLC) for reporting this.
+     [Stefan Eissing]
+
+  *) mod_proxy: Add backend port to log messages to
+     ease identification of involved service.  [Rainer Jung]
+
   *) mod_http2: remove unused and insecure code. Fixes PR66037.
      Thanks to Ronald Crane (Zippenhop LLC) for reporting this.
 

diff --git a/changes-entries/mod_proxy_log_backend_port.txt b/changes-entries/mod_proxy_log_backend_port.txt
deleted file mode 100644 (file)
index 0a96679..0000000
--- a/changes-entries/mod_proxy_log_backend_port.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy: Add backend port to log messages to
-     ease identification of involved service.

diff --git a/changes-entries/pr66037.txt b/changes-entries/pr66037.txt
deleted file mode 100644 (file)
index 7262ff2..0000000
--- a/changes-entries/pr66037.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_http2: remove unused and insecure code. Fixes PR66037.
-     Thanks to Ronald Crane (Zippenhop LLC) for reporting this.
-     [Stefan Eissing]
\ No newline at end of file