From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 11 Jul 2024 14:33:31 +0000 (+0000)
Subject: Merged in r1919123
X-Git-Tag: 2.4.62-rc1-candidate~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7cbc6237f46a8f206dedbaa86e22bb08fd8eba1;p=thirdparty%2Fapache%2Fhttpd.git

Merged in r1919123

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

diff --git a/STATUS b/STATUS
index 83c0e1d98fa..360eebac635 100644
--- a/STATUS
+++ b/STATUS
@@ -156,16 +156,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: add OpenSSL STORE based PKCS#11 support, and fix
-     crashes in ENGINE-based PKCS#11 with OpenSSL 3.2
-     trunk patch: https://svn.apache.org/r1914365
-                  https://svn.apache.org/r1914622
-                  https://svn.apache.org/r1916057
-                  https://svn.apache.org/r1918024
-     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/455.diff
-     PR: https://github.com/apache/httpd/pull/455
-     +1: jorton, ylavic, rpluem
-
    *) mod_proxy: Don't reset the balancer when we create a new child
       and don't change shared memory mod_lbmethod_bytraffic is not using.
       trunk patch: https://svn.apache.org/r1916004