From: Jim Jagielski <jim@apache.org>
Date: Mon, 9 May 2022 17:55:06 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.54-rc1-candidate~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712e4383d81e96ceb8780758852ee31f948b1d8f;p=thirdparty%2Fapache%2Fhttpd.git

promote



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

diff --git a/STATUS b/STATUS
index aedb6a3b04a..82c04588836 100644
--- a/STATUS
+++ b/STATUS
@@ -154,6 +154,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jaillect36, ylavic, rpluem
 
 
+  *) mod_heartmonitor: Set the documented default value
+     "10" for HeartbeatMaxServers instead of "0". With "0"
+     no shared memory slotmem was initialized.
+     trunk patches: https://svn.apache.org/r1899841
+                    https://svn.apache.org/r1900026
+     2.4.x patches: svn merge -c 1899841 ^/httpd/httpd/trunk .
+                    svn merge -c 1900026 ^/httpd/httpd/trunk .
+     +1: rjung, rpluem, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -186,15 +196,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: I think "extra" should be an apr_size_t.
      icing: added r1899905 with the proposed changes and assertions.
 
-  *) mod_heartmonitor: Set the documented default value
-     "10" for HeartbeatMaxServers instead of "0". With "0"
-     no shared memory slotmem was initialized.
-     trunk patches: https://svn.apache.org/r1899841
-                    https://svn.apache.org/r1900026
-     2.4.x patches: svn merge -c 1899841 ^/httpd/httpd/trunk .
-                    svn merge -c 1900026 ^/httpd/httpd/trunk .
-     +1: rjung, rpluem, jim
-
   *) mod_proxy: Set a status code of 502 in case the backend just closed the
      connection in reply to our forwarded request.
      Trunk version of patch: