From: Eric Covener <covener@apache.org>
Date: Wed, 4 Aug 2021 11:52:52 +0000 (+0000)
Subject: vote [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2981baafef219761fd880142ef3a95a8b7ae6596;p=thirdparty%2Fapache%2Fhttpd.git

vote [skip ci]


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

diff --git a/STATUS b/STATUS
index 28914cc4ce2..c08dfcfc97a 100644
--- a/STATUS
+++ b/STATUS
@@ -312,17 +312,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           https://svn.apache.org/r1889327
           https://svn.apache.org/r1891200
      2.4.x patch: svn merge -c 1817063,1831165,1831171,1831172,1849590,1849630,1856491,1883421,1889327,1891200 ^/httpd/httpd/trunk .
-     +1: jailletc36
+     +1: jailletc36, covener
      icing: I have trouble running the svn merge due to conflicts in CHANGES and
             the infamous log tags. Do you have a patch or a PR to use for checking?
+     covener: on faith
 
-  *) core: add hook 'child_stoppingthat gets called when the MPM is stopping a
-     child process. The additionalgraceful` parameter allows registered hooks
+  *) 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
+     +1: icing, covener
 
   *) core: fix ap_escape_quotes for pre-escaped quotes
      trunk patch: https://svn.apache.org/r1892012