* Backported [skip ci]

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

diff --git a/CHANGES b/CHANGES
index 89b7831bd1d9f9d2fd16937e20bc4e03894d9d14..f87211b9d85d499ebe73753142b13e0783442572 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.53
 
+  *) mpm_event: Fix a possible listener deadlock on heavy load when restarting
+     and/or reaching MaxConnectionsPerChild.  PR 65769.  [Yann Ylavic]
+
 Changes with Apache 2.4.52
 
   *) SECURITY: CVE-2021-44790: Possible buffer overflow when parsing

diff --git a/STATUS b/STATUS
index 3600ce295607549474f9d9063b9cbf57ad65aeeb..96c8cc619854f379794a3c45ab6a8eadc6df7c9c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -147,14 +147,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mpm_event: Fix a possible listener deadlock on heavy load when restarting
-     and/or reaching MaxConnectionsPerChild.  PR 65769.
-     Trunk version of patch:
-        https://svn.apache.org/r1896505
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1896505 ^/httpd/httpd/trunk .
-     +1: rpluem, ylavic, gbechis
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/changes-entries/bz_65769.txt b/changes-entries/bz_65769.txt
deleted file mode 100644 (file)
index 7fede1a..0000000
--- a/changes-entries/bz_65769.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mpm_event: Fix a possible listener deadlock on heavy load when restarting
-     and/or reaching MaxConnectionsPerChild.  PR 65769.  [Yann Ylavic]