From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 26 Jun 2024 12:58:48 +0000 (+0000)
Subject: Merge proposals.
X-Git-Tag: 2.4.60-rc4-candidate~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a68512140616e494c1cdbaaaef323ccd80cfcf;p=thirdparty%2Fapache%2Fhttpd.git

Merge proposals.

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

diff --git a/STATUS b/STATUS
index d2c640b9e68..f25574f2677 100644
--- a/STATUS
+++ b/STATUS
@@ -157,13 +157,12 @@ RELEASE SHOWSTOPPERS:
      2.4.x patch: https://github.com/apache/httpd/pull/458/files
      +1 covener
 
-  *) proxy_fixup UDS stripping regression
-     Trunk patch:
-       https://svn.apache.org/r1918647
-       https://svn.apache.org/r1918626
-     2.4.x patch: https://github.com/apache/httpd/pull/457/files
-     +1 covener
-
+  *) mod_proxy: Fixup UDS filename for mod_proxy called through r->handler
+     trunk patch: https://svn.apache.org/r1918626
+                  https://svn.apache.org/r1918647
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/457.diff
+     PR: https://github.com/apache/httpd/pull/457
+     +1: ylavic, covener,
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
@@ -240,13 +239,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     PR: https://github.com/apache/httpd/pull/449
     +1: ylavic, icing, 
 
-  *) mod_proxy: Fixup UDS filename for mod_proxy called through r->handler
-     trunk patch: https://svn.apache.org/r1918626
-                  https://svn.apache.org/r1918647
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/457.diff
-     PR: https://github.com/apache/httpd/pull/457
-     +1: ylavic,
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]