From: Graham Leggett <minfrin@apache.org>
Date: Sun, 26 Sep 2021 14:34:20 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: candidate-2.4.50-rc1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4d68f364ab947d03838abf18dbedb89aeb3368f;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index bb3638b43eb..47a72a27015 100644
--- a/STATUS
+++ b/STATUS
@@ -142,6 +142,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mpm event: Correctly count active child processes in parent process if
+     child process dies due to MaxConnectionsPerChild. PR 65592.
+     Trunk version of patch:
+        https://svn.apache.org/r1893520
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1893520 ^/httpd/httpd/trunk .
+     +1: rpluem, ylavic, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -156,15 +165,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      is not the right fix, then it should be removed from trunk.
      Putting it here is a way to revive the discussion
 
-  *) mpm event: Correctly count active child processes in parent process if
-     child process dies due to MaxConnectionsPerChild. PR 65592.
-     Trunk version of patch:
-        https://svn.apache.org/r1893520
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1893520 ^/httpd/httpd/trunk .
-     +1: rpluem, ylavic,
-
   *) mod_dav: Add utility functions dav_validate_root_ns(),
      dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
      dav_find_attr() so that other modules get to play too.