From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 7 Sep 2021 15:29:23 +0000 (+0000)
Subject: Sync CHANGES [skip ci].
X-Git-Tag: 2.5.0-alpha2-ci-test-only~822
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40df9da013c57f6e84eee36df089336e49d62a94;p=thirdparty%2Fapache%2Fhttpd.git

Sync CHANGES [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1893049 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4566202c887..e8f7b94fd9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,25 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) core: Initialize the request fields on read failure to avoid NULLs.
+     [Yann Ylavic]
+
+  *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and
+     "ProxyPassInterpolateEnv On" are configured.  PR 65549.
+     [Joel Self <joelself gmail.com>]
+
+  *) mpm_event: Fix children processes possibly not stopped on graceful
+     restart.  PR 63169.  [Joel Self <joelself gmail.com>]
+
+  *) mod_unique_id: Reduce the time window where duplicates may be generated
+     PR 65159
+     [Christophe Jaillet]
+
+  *) Revert "mod_unique_id: Fix potential duplicated ID generation under heavy load.
+     PR 65159" added in 2.4.47.
+     This causes issue on Windows.
+     [Christophe Jaillet]
+
   *) mod_proxy_uwsgi: Fix PATH_INFO setting for generic worker.  [Yann Ylavic]
 
   *) mod_md: Certificate/keys pairs are verified as matching before a renewal is accepted
diff --git a/changes-entries/Reduce_time_window_for_duplicate_in_uniqueid.txt b/changes-entries/Reduce_time_window_for_duplicate_in_uniqueid.txt
deleted file mode 100644
index e8a8f9c0334..00000000000
--- a/changes-entries/Reduce_time_window_for_duplicate_in_uniqueid.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_unique_id: Reduce the time window where duplicates may be generated
-     PR 65159
-     [Christophe Jaillet]
diff --git a/changes-entries/event_maintenance_spawn_limit.txt b/changes-entries/event_maintenance_spawn_limit.txt
deleted file mode 100644
index 7179c3b3158..00000000000
--- a/changes-entries/event_maintenance_spawn_limit.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mpm_event: Fix children processes possibly not stopped on graceful
-     restart.  PR 63169.  [Joel Self <joelself gmail.com>]
\ No newline at end of file
diff --git a/changes-entries/init_request_on_read_failure.txt b/changes-entries/init_request_on_read_failure.txt
deleted file mode 100644
index c59bf89460e..00000000000
--- a/changes-entries/init_request_on_read_failure.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) core: Initialize the request fields on read failure to avoid NULLs.
-     [Yann Ylavic]
\ No newline at end of file
diff --git a/changes-entries/proxy_nocanon_interpolate.txt b/changes-entries/proxy_nocanon_interpolate.txt
deleted file mode 100644
index a2b033cbbf0..00000000000
--- a/changes-entries/proxy_nocanon_interpolate.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and
-     "ProxyPassInterpolateEnv On" are configured.  PR 65549.
-     [Joel Self <joelself gmail.com>]
\ No newline at end of file
diff --git a/changes-entries/revert_r887244_and_r887245.txt b/changes-entries/revert_r887244_and_r887245.txt
deleted file mode 100644
index 4b65e1d9f92..00000000000
--- a/changes-entries/revert_r887244_and_r887245.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) Revert "mod_unique_id: Fix potential duplicated ID generation under heavy load.
-     PR 65159" added in 2.4.47.
-     This causes issue on Windows.
-     [Christophe Jaillet]