From: Stefan Eissing <icing@apache.org>
Date: Thu, 24 Aug 2023 07:29:38 +0000 (+0000)
Subject: vote and promote
X-Git-Tag: 2.4.58-rc1-candidate~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e1b36e3843d76c9aabebb4b43af01833f01229;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote


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

diff --git a/STATUS b/STATUS
index 1335636b856..be8641fd370 100644
--- a/STATUS
+++ b/STATUS
@@ -162,6 +162,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
      +1: minfrin, covener, icing
 
+  *) mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".
+     Resolve inconsistency between the previous two occurrences by
+     counting workers in state SERVER_GRACEFUL no longer as busy,
+     but instead in a new counter "GracefulWorkers" (or on HTML
+     view as "workers gracefully restarting"). Also add the graceful
+     counter as a new column to the existing HTML per process table
+     for async MPMs.
+     PR 63300
+     Trunk version of patch:
+        https://svn.apache.org/r1909429
+        https://svn.apache.org/r1909606
+     Backport version for 2.4.x of patch:
+        svn merge -c r1909429,r1909606 ^/httpd/httpd/trunk .
+     +1: rjung, jorton, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -222,21 +237,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: minfrin
      covener: diff doesn't seem to apply clean to 2.4.x (with or without 1861542,r1861569 above)
 
-  *) mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".
-     Resolve inconsistency between the previous two occurrences by
-     counting workers in state SERVER_GRACEFUL no longer as busy,
-     but instead in a new counter "GracefulWorkers" (or on HTML
-     view as "workers gracefully restarting"). Also add the graceful
-     counter as a new column to the existing HTML per process table
-     for async MPMs.
-     PR 63300
-     Trunk version of patch:
-        https://svn.apache.org/r1909429
-        https://svn.apache.org/r1909606
-     Backport version for 2.4.x of patch:
-        svn merge -c r1909429,r1909606 ^/httpd/httpd/trunk .
-     +1: rjung, jorton
-
   *) mod_dav: add DavBasePath (PR 35077)
      Trunk version of patch:
         https://svn.apache.org/r1911651