From: Stefan Eissing <icing@apache.org>
Date: Thu, 23 Sep 2021 12:31:12 +0000 (+0000)
Subject: vote and promote [skip ci]
X-Git-Tag: candidate-2.4.50-rc1~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e0554788bc3d3b71ff15ff98fd444c7a0bec859;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@1893558 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 10ef20fcad2..0f0b6d14da7 100644
--- a/STATUS
+++ b/STATUS
@@ -150,6 +150,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                    http://people.apache.org/~covener/patches/speling-sync.diff
       +1 covener, rpluem, ylavic
 
+  *) mod_proxy: Handle UDS URIs with empty hostname ("unix:///...") as if they
+     had no hostname ("unix:/..."), also in mod_rewrite's is_absolulte_uri().
+     trunk patch: http://svn.apache.org/r1893519
+                  http://svn.apache.org/r1893532
+     2.4.x patch: svn merge -c 1893519,1893532 ^/httpd/httpd/trunk .
+     +1: ylavic, rpluem, icing
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -175,13 +182,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR: https://github.com/apache/httpd/pull/270
      +1: icing,
 
-  *) mod_proxy: Handle UDS URIs with empty hostname ("unix:///...") as if they
-     had no hostname ("unix:/..."), also in mod_rewrite's is_absolulte_uri().
-     trunk patch: http://svn.apache.org/r1893519
-                  http://svn.apache.org/r1893532
-     2.4.x patch: svn merge -c 1893519,1893532 ^/httpd/httpd/trunk .
-     +1: ylavic, rpluem
-
   *) mpm event: Correctly count active child processes in parent process if
      child process dies due to MaxConnectionsPerChild. PR 65592.
      Trunk version of patch: