From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 20 Feb 2020 07:07:37 +0000 (+0000)
Subject: * Backported in r1874196, r1874201, r1874202 [skip ci]
X-Git-Tag: 2.4.42~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9b278832c8b72801b5f88565942725eae1154b1;p=thirdparty%2Fapache%2Fhttpd.git

* Backported in r1874196, r1874201, r1874202 [skip ci]

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

diff --git a/STATUS b/STATUS
index 6f3829dd764..bf01d37a012 100644
--- a/STATUS
+++ b/STATUS
@@ -132,24 +132,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) mod_ssl: Add support for loading certs & keys from PKCS#11 URLs via the
-               OpenSSL pkcs11 engine.  Includes related minor cleanups and
-               simplification to mod_ssl internals.
-      trunk patch: http://svn.apache.org/r1830819
-                   http://svn.apache.org/r1830912
-                   http://svn.apache.org/r1830913
-                   http://svn.apache.org/r1830927
-                   http://svn.apache.org/r1831168
-                   http://svn.apache.org/r1831173
-                   http://svn.apache.org/r1835240
-                   http://svn.apache.org/r1835242
-                   http://svn.apache.org/r1835615
-                   http://svn.apache.org/r1836547
-      2.4.x patch: https://github.com/apache/httpd/commit/709a625b8e3fd3cd3426be5a005c1c60079c8d59.patch
-      Test results: https://travis-ci.org/apache/httpd/builds/638362588
-      +1: jorton, jim, ylavic
-      minfrin: This needs mentioning in the docs.
-
    *) mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.
       trunk patch: http://svn.apache.org/r1861950
       2.4.x patch: svn merge -c 1861950 ^/httpd/httpd/trunk .