From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 6 Sep 2021 10:53:37 +0000 (+0000)
Subject: Sync CHANGES entries [skip ci].
X-Git-Tag: candidate-2.4.49-rc1~3^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47bb385fdf3d9a9fbf40b23f9f0c546af0eaa3d3;p=thirdparty%2Fapache%2Fhttpd.git

Sync CHANGES entries [skip ci].

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

diff --git a/CHANGES b/CHANGES
index e16f060b99c..0e5bb22ba64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,24 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.49
 
+  *) mod_proxy: Fix a potential infinite loop when tunneling Upgrade(d)
+     protocols from mod_proxy_http, and a timeout triggering falsely when
+     using mod_proxy_wstunnel, mod_proxy_connect or mod_proxy_http with
+     upgrade= setting.  PRs 65521 and 65519.  [Yann Ylavic]
+
+  *) mod_unique_id: Reduce the time window where duplicates may be generated
+     PR 65159
+     [Christophe Jaillet]
+
+  *) mpm_prefork: Block signals for child_init hooks to prevent potential
+     threads created from there to catch MPM's signals.
+     [Ruediger Pluem, Yann Ylavic]
+
+  *) 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/ap_proxy_tunnel_run.txt b/changes-entries/ap_proxy_tunnel_run.txt
deleted file mode 100644
index c31cfcd3743..00000000000
--- a/changes-entries/ap_proxy_tunnel_run.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) mod_proxy: Fix a potential infinite loop when tunneling Upgrade(d)
-     protocols from mod_proxy_http, and a timeout triggering falsely when
-     using mod_proxy_wstunnel, mod_proxy_connect or mod_proxy_http with
-     upgrade= setting.  PRs 65521 and 65519.  [Yann Ylavic]
\ No newline at end of file
diff --git a/changes-entries/prefork_child_init_sigmask.txt b/changes-entries/prefork_child_init_sigmask.txt
deleted file mode 100644
index 16c2eb241d5..00000000000
--- a/changes-entries/prefork_child_init_sigmask.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mpm_prefork: Block signals for child_init hooks to prevent potential
-     threads created from there to catch MPM's signals.
-     [Ruediger Pluem, Yann Ylavic]
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]