]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1781575, r1781577, r1781580, r1781687, r1783305 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 3 Apr 2017 11:39:20 +0000 (11:39 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 3 Apr 2017 11:39:20 +0000 (11:39 +0000)
commit0fc9880259a00dd909082451fb2be50ff39462c3
treea68d2f09fdb5d8ebca0f5e1de48983eade8f6c31
parent6f8a10eda7c9bd3cc3c5d824061589991b0b5b1e
Merge r1781575, r1781577, r1781580, r1781687, r1783305 from trunk:

Add Configuration for trusted OCSP responder certificates
Fix for PR 46037

Add back the file I removed in r1781575.

Add missing documentation for r1781575
Fix for PR 46037

Remove unused variable

Fix OpenSSL 1.1.0 breakage in r1781575; BIO_s_file_internal() is gone.

Submitted by: jfclere, druggeri, wrowe
Reviewed by: jfclere, jim, ylavic
Merge r1788430 from trunk:

mod_ssl: follow up to r1781575
Fix SSLOCSPNoVerify merging, and while at it capitalize Verify as suggested
by wrowe.

Submitted by: ylavic
Reviewed by: jfclere, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789970 13f79535-47bb-0310-9956-ffa450edef68
STATUS
docs/manual/mod/mod_ssl.xml
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_ocsp.c
modules/ssl/ssl_private.h
modules/ssl/ssl_util_ocsp.c