consolidate CHANGES [skip ci]

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

diff --git a/CHANGES b/CHANGES
index a12fa723488b90eb6acd0e1cc326f900cf95379f..61545257b346513365803d8435cf7a04ffc24e18 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,32 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.50
 
+  *) mod_md: when MDMessageCmd for a 'challenge-setup:<type>:<dnsname>'
+     fails (!= 0 exit), the renewal process is aborted and an error is
+     reported for the MDomain. This provides scripts that distribute
+     information in a cluster to abort early with bothering an ACME
+     server to validate a dns name that will not work. The common
+     retry logic will make another attempt in the future, as with
+     other failures.
+     Fixed a bug when adding private key specs to an already working
+     MDomain, see <https://github.com/icing/mod_md/issues/260>.
+     [Stefan Eissing]
+
+  *) mod_proxy: Handle UDS URIs with empty hostname ("unix:///...") as if they
+     had no hostname ("unix:/...").  [Yann Ylavic]
+
+  *) mod_md: fixed a bug in handling multiple parallel OCSP requests. These could
+     run into an assertion which terminated (and restarted) the child process where
+     the task was running. Eventually, all OCSP responses were collected, but not
+     in the way that things are supposed to work.
+     See also <https://bz.apache.org/bugzilla/show_bug.cgi?id=65567>.
+     The bug was possibly triggered when more than one OCSP status needed updating
+     at the same time. For example for several renewed certificates after a server
+     reload.
+
+  *) mod_rewrite: Fix UDS ("unix:") scheme for [P] rules.  PR 57691 + 65590.
+     [Janne Peltonen <janne.peltonen sange.fi>]
+
   *) event mpm: Correctly count active child processes in parent process if
      child process dies due to MaxConnectionsPerChild.
      PR 65592 [Ruediger Pluem]

diff --git a/changes-entries/md_ocsp_multi_update.txt b/changes-entries/md_ocsp_multi_update.txt
deleted file mode 100644 (file)
index e927c79..0000000
--- a/changes-entries/md_ocsp_multi_update.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-  *) mod_md: fixed a bug in handling multiple parallel OCSP requests. These could
-     run into an assertion which terminated (and restarted) the child process where
-     the task was running. Eventually, all OCSP responses were collected, but not
-     in the way that things are supposed to work.
-     See also <https://bz.apache.org/bugzilla/show_bug.cgi?id=65567>.
-     The bug was possibly triggered when more than one OCSP status needed updating
-     at the same time. For example for several renewed certificates after a server
-     reload.

diff --git a/changes-entries/md_pkeys_challenge_setup.txt b/changes-entries/md_pkeys_challenge_setup.txt
deleted file mode 100644 (file)
index b722a3a..0000000
--- a/changes-entries/md_pkeys_challenge_setup.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-  *) mod_md: when MDMessageCmd for a 'challenge-setup:<type>:<dnsname>'
-     fails (!= 0 exit), the renewal process is aborted and an error is
-     reported for the MDomain. This provides scripts that distribute
-     information in a cluster to abort early with bothering an ACME
-     server to validate a dns name that will not work. The common
-     retry logic will make another attempt in the future, as with
-     other failures.
-     Fixed a bug when adding private key specs to an already working
-     MDomain, see <https://github.com/icing/mod_md/issues/260>.
-     [Stefan Eissing]

diff --git a/changes-entries/rewrite_uds.txt b/changes-entries/rewrite_uds.txt
deleted file mode 100644 (file)
index 4b752a8..0000000
--- a/changes-entries/rewrite_uds.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_rewrite: Fix UDS ("unix:") scheme for [P] rules.  PR 57691 + 65590.
-     [Janne Peltonen <janne.peltonen sange.fi>]
\ No newline at end of file

diff --git a/changes-entries/uds_empty_hostname.txt b/changes-entries/uds_empty_hostname.txt
deleted file mode 100644 (file)
index beff302..0000000
--- a/changes-entries/uds_empty_hostname.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy: Handle UDS URIs with empty hostname ("unix:///...") as if they
-     had no hostname ("unix:/...").  [Yann Ylavic]
\ No newline at end of file