From: Eric Covener <covener@apache.org>
Date: Tue, 2 Jul 2024 12:06:11 +0000 (+0000)
Subject: add/reset
X-Git-Tag: 2.4.61-rc1-candidate~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7d77cca0f2183bc6f34f6ad233074a128da44a;p=thirdparty%2Fapache%2Fhttpd.git

add/reset


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

diff --git a/STATUS b/STATUS
index 6225d32d502..94671fb2c39 100644
--- a/STATUS
+++ b/STATUS
@@ -153,8 +153,11 @@ RELEASE SHOWSTOPPERS:
 
   *) maintain ct trusted flag across ap_internal_fast_redirect
      Trunk version of patch: https://svn.apache.org/r1918795.
-     2.4.x patch:  svn merge -c 1918795 ^/httpd/httpd/trunk .
-     +1 covener, ylavic
+        https://svn.apache.org/r1918814
+        https://svn.apache.org/r1918815
+        https://svn.apache.org/r1918823
+     2.4.x patch:  https://github.com/apache/httpd/pull/459
+     +1 covener
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]