From 50dca0837f36b004488d24bc794176d39b30860d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 17 Jan 2020 10:30:55 +0000 Subject: [PATCH] Reset mod_ssl PKCS#11 proposal with added r1836547. [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1872911 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 23dcc6fdd8d..dc956145fed 100644 --- a/STATUS +++ b/STATUS @@ -168,12 +168,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1835240 http://svn.apache.org/r1835242 http://svn.apache.org/r1835615 - 2.4.x patch: http://people.apache.org/~jorton/mod_ssl_pkcs11.patch - +1: jorton, ylavic, - ylavic: engine part not tested, but works with no engine still - jailletc36: not reviewed, but at least r1836547 seems to be missing, according - to changelog - minfrin: r1836547 is indeed missing. + 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, *) mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+. trunk patch: http://svn.apache.org/r1861950 -- 2.47.3