From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 21 Feb 2020 00:07:16 +0000 (+0000)
Subject: Backported. [skip ci]
X-Git-Tag: 2.4.42~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b28097f38adbdfed29225174699b2b9aac382e3;p=thirdparty%2Fapache%2Fhttpd.git

Backported. [skip ci]

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

diff --git a/STATUS b/STATUS
index fd27119472f..3bd51c22c91 100644
--- a/STATUS
+++ b/STATUS
@@ -132,11 +132,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) 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 . 
-      +1: minfrin, jim, ylavic
-
    *) mod_ssl: Disable client verification on ACME ALPN challenges. Fixes github
       issue mod_md#172 (https://github.com/icing/mod_md/issues/172).
       [Michael Kaufmann <mail michael-kaufmann.ch>, Stefan Eissing]