From: Joe Orton <jorton@apache.org>
Date: Thu, 4 Jun 2026 08:50:55 +0000 (+0000)
Subject: Merged.
X-Git-Tag: 2.4.68-rc1-candidate~11
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=7bfe9266c21c646d1e5bc010465e707b41425e8b;p=thirdparty%2Fapache%2Fhttpd.git

Merged.

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

diff --git a/STATUS b/STATUS
index 43c9ba8a6c..0dac389e09 100644
--- a/STATUS
+++ b/STATUS
@@ -167,11 +167,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
-  *) Fix compatibility with OpenSSL 4.0
-     trunk patch: https://svn.apache.org/1933612 [plus many CI changes]
-     2.4.x patch: https://github.com/apache/httpd/pull/642
-     +1: jorton, covener (skimmed+CI results), rpluem
-
   *) test/h2: ignore AH02430 for the whole TestRfc9113 class.
      trunk patch: http://svn.apache.org/r1934891
      2.4.x patch: svn merge -c 1934891 ^/httpd/httpd/trunk .