From: Eric Covener <covener@apache.org>
Date: Tue, 13 Aug 2024 14:19:32 +0000 (+0000)
Subject: add/vote/promote
X-Git-Tag: 2.4.63-candidate~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9dcbce41cbec0316f311eb7b40e78959d1580cb;p=thirdparty%2Fapache%2Fhttpd.git

add/vote/promote

[skip ci]


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

diff --git a/STATUS b/STATUS
index 8fec5846b6b..fc5866e206c 100644
--- a/STATUS
+++ b/STATUS
@@ -157,6 +157,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_rewrite: backport better/simpler rewritelog() macro to fix
+     line numbers logged and make merging trunk->2.4.x easier
+     trunk patch: https://svn.apache.org/r1866894
+     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/464.diff
+     PR: https://github.com/apache/httpd/pull/464
+     +1: jorton, ylavic, covener
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -182,13 +189,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c r1914038 ^/httpd/httpd/trunk .
       +1: minfrin, covener
 
-  *) mod_rewrite: backport better/simpler rewritelog() macro to fix
-     line numbers logged and make merging trunk->2.4.x easier
-     trunk patch: https://svn.apache.org/r1866894
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/464.diff
-     PR: https://github.com/apache/httpd/pull/464
-     +1: jorton, ylavic,
-
   *) mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs
                 in <Location> (incomplete fix in 2.4.62). PR 69160.
      trunk patch: https://svn.apache.org/r1919532
@@ -224,6 +224,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c r1919413 -c r1919587 -c r1919602 ^/httpd/httpd/trunk .
      +1: ivan
 
+  *) mod_rewrite: don't merge leading slashes when they come from a perdir prefix
+     (rather than the substitution)
+     Trunk version of patch:
+        https://svn.apache.org/r1919860
+     Backport version for 2.4.x of patch:
+       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/473.diff
+     Can be applied via apply_backport_pr.sh 473
+     +1: covener
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]