From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 27 Mar 2024 09:27:23 +0000 (+0000)
Subject: Merge in r1916575.
X-Git-Tag: 2.4.59-rc1-candidate~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17a7199fb895e8cd10d4850edc068ef34dfcfdf2;p=thirdparty%2Fapache%2Fhttpd.git

Merge in r1916575.

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

diff --git a/STATUS b/STATUS
index 0b0d684581a..e5be51609dd 100644
--- a/STATUS
+++ b/STATUS
@@ -152,11 +152,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) mod_ssl: Keep "SSLCompression off" working with latest OpenSSL(s)/OPENSSL_NO_COMP.
-      trunk patch: https://svn.apache.org/r1916561
-      2.4.x patch: svn merge -c 1916561 ^/httpd/httpd/trunk .
-      +1: ylavic, rpluem, jorton
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]