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 e16f060b99c32a957861a7caf63e7ef9abf6e92f..0e5bb22ba643b164d2bd5625fec8fca4e5f93d7d 100644 (file)
--- 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 (file)
index e8a8f9c..0000000
--- 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 (file)
index c31cfcd..0000000
--- 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 (file)
index 16c2eb2..0000000
--- 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 (file)
index 4b65e1d..0000000
--- 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]