From: Stefan Eissing <icing@apache.org>
Date: Wed, 25 May 2022 11:47:59 +0000 (+0000)
Subject: vote and promote [skip ci]
X-Git-Tag: 2.4.54-rc1-candidate~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a51ef05d9cbfbbe580e0552654190c738bcff71;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote [skip ci]


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

diff --git a/STATUS b/STATUS
index eb6045eab88..5d2b2cec90b 100644
--- a/STATUS
+++ b/STATUS
@@ -148,6 +148,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy_connect: Ensure that the configured timeout is set on the
+     backend socket.
+     Trunk version of patch:
+        https://svn.apache.org/r1901088
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1901088 ^/httpd/httpd/trunk .
+     +1: rpluem, jorton, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -187,15 +196,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rpluem says: Should we add a CHANGES entry as it seems to fix PR65769?
      ylavic: CHANGES entry added in r1900991
 
-  *) mod_proxy_connect: Ensure that the configured timeout is set on the
-     backend socket.
-     Trunk version of patch:
-        https://svn.apache.org/r1901088
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1901088 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, 
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]