]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
1 done, 1 vote.
authorJoe Orton <jorton@apache.org>
Mon, 7 Jul 2025 09:28:16 +0000 (09:28 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 7 Jul 2025 09:28:16 +0000 (09:28 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927024 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 69459a5202e4c9e1ab3d477ef86f12b6904f590f..3dc93f3cb66a7c24806eab93c6023e35aa6bdaf3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -158,16 +158,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: Drop SSLKEYKOGFILE for OpenSSL 3.5+
-     trunk patch: https://svn.apache.org/r1926720
-                  https://svn.apache.org/r1926722
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/538.diff
-             (backport: dev-tools/github/apply_backport_pr.sh 538)
-     +1: jorton, rpluem, ylavic
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
   *) Makefile.in: Correctly deal with change entries whose filenames contain
      spaces.
      Trunk version of patch:
@@ -176,7 +166,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
       Trunk version of patch works
       svn merge -c 1926110,1926111 ^/httpd/httpd/trunk .
-     +1: rpluem, ylavic,
+     +1: rpluem, ylavic, jorton
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
 
   *) mod_proxy_ajp: Use iobuffersize set on worker level for the IO buffer
      size.