From: Graham Leggett <minfrin@apache.org>
Date: Mon, 13 Dec 2021 10:42:56 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: candidate-2.4.52-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488bebf267bd488239585dd5dac5bfb107313c09;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index cc9d4019509..28f0a5a6f2d 100644
--- a/STATUS
+++ b/STATUS
@@ -145,6 +145,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mpm_event: Restart stopping of idle children after a load peak. PR 65626.
+     trunk patch: http://svn.apache.org/r1894285
+                  http://svn.apache.org/r1894286
+                  http://svn.apache.org/r1894291
+                  http://svn.apache.org/r1895550
+                  http://svn.apache.org/r1895553
+                  http://svn.apache.org/r1895630
+     backport PR: https://github.com/apache/httpd/pull/276
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/276.patch
+     +1: ylavic, rpluem, minfrin
+     ylavic: updated with r1894291 for correctness of perform_idle_server_maintenance()
+             w.r.t. num_buckets > 1 and ease merging of r1895553, with r1895550 for
+             correctness of active_daemons used in r1895553 and r1895630.
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -181,20 +195,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-element2.patch
      +1: minfrin, ylavic (by inspection),
 
-  *) mpm_event: Restart stopping of idle children after a load peak. PR 65626.
-     trunk patch: http://svn.apache.org/r1894285
-                  http://svn.apache.org/r1894286
-                  http://svn.apache.org/r1894291
-                  http://svn.apache.org/r1895550
-                  http://svn.apache.org/r1895553
-                  http://svn.apache.org/r1895630
-     backport PR: https://github.com/apache/httpd/pull/276
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/276.patch
-     +1: ylavic, rpluem
-     ylavic: updated with r1894291 for correctness of perform_idle_server_maintenance()
-             w.r.t. num_buckets > 1 and ease merging of r1895553, with r1895550 for
-             correctness of active_daemons used in r1895553 and r1895630.
-
   *) Easy backports:
      - mod_deflate: be explicit when setting c->etag_opt = AP_DEFLATE_ETAG_ADDSUFFIX
      - mod_proxy_balancer: add missing spaces in HTML output