From: Eric Covener <covener@apache.org>
Date: Mon, 25 Nov 2024 13:37:36 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.4.63-candidate~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c39fba732d8b92374ad4922c92b84f22ecf822fb;p=thirdparty%2Fapache%2Fhttpd.git

backported

[skip ci]


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

diff --git a/STATUS b/STATUS
index 37f2d974b1a..ed7cafeb744 100644
--- a/STATUS
+++ b/STATUS
@@ -157,12 +157,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: Fix regression in PKCS#11 handling which should work without
-     SSLCryptoDevice configured
-     trunk patch: https://svn.apache.org/r1920597
-                  https://svn.apache.org/r1921076
-     2.4.x patch: svn merge -c 1920597 -c 1921076 ^/httpd/httpd/trunk .
-     +1: jorton, ylavic, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]