From: Stefan Eissing <icing@apache.org>
Date: Wed, 25 May 2022 12:10:29 +0000 (+0000)
Subject: update after backport [skip ci]
X-Git-Tag: 2.4.54-rc1-candidate~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e27e9e934971a2ccc702e3effe5e8dc25c0f43bd;p=thirdparty%2Fapache%2Fhttpd.git

update after backport [skip ci]


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

diff --git a/STATUS b/STATUS
index f13421e5e1f..a62fdaa3527 100644
--- a/STATUS
+++ b/STATUS
@@ -148,19 +148,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mpm_event, mpm_worker: Handle children killed pathologically.
-     Trunk version of patch:
-        https://svn.apache.org/r1899858
-        https://svn.apache.org/r1899865
-        https://svn.apache.org/r1899884
-        https://svn.apache.org/r1900991
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1899858,1899865,1899884,1900991 ^/httpd/httpd/trunk .
-     +1: rpluem, ylavic, icing
-     rpluem says: Should we add a CHANGES entry as it seems to fix PR65769?
-     ylavic: CHANGES entry added in r1900991
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]