From: Stefan Eissing <icing@apache.org>
Date: Tue, 10 Aug 2021 08:43:32 +0000 (+0000)
Subject: update after merge [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae4ec3086b81fe2a90fda6e0bfd30085f00ec867;p=thirdparty%2Fapache%2Fhttpd.git

update after merge [skip ci]


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

diff --git a/STATUS b/STATUS
index 92c2cdb3b17..5c9b74b4062 100644
--- a/STATUS
+++ b/STATUS
@@ -266,14 +266,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
             the infamous log tags. Do you have a patch or a PR to use for checking?
      covener: on faith
 
-  *) core: add hook child_stopping hook that gets called when the MPM is stopping a
-     child process. The additional graceful parameter allows registered hooks
-     to free resources early during a graceful shutdown.
-     trunk patch:
-          https://svn.apache.org/r1891919
-     2.4.x patch: https://github.com/apache/httpd/pull/259.diff
-     +1: icing, covener, jim
-
   *) core: fix ap_escape_quotes for pre-escaped quotes
      trunk patch: https://svn.apache.org/r1892012
      2.4.x patch: svn merge -c 1892012 ^/httpd/httpd/trunk .