From: Joe Orton <jorton@apache.org>
Date: Tue, 20 Aug 2024 08:35:28 +0000 (+0000)
Subject: Merged x1.
X-Git-Tag: 2.4.63-candidate~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ced3538006e4f4b27631aad637d3f184ba5762a;p=thirdparty%2Fapache%2Fhttpd.git

Merged x1.

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

diff --git a/STATUS b/STATUS
index e473e5cef26..821ffe19e6e 100644
--- a/STATUS
+++ b/STATUS
@@ -157,13 +157,6 @@ 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
-
   *) 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