]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1583191, r1584098, r1584665, r1591401 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 8 Jul 2014 13:13:49 +0000 (13:13 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 8 Jul 2014 13:13:49 +0000 (13:13 +0000)
commit557cfead262e322aa93fa52a10eee3e5b5d2e325
treef8c31de0492fa5f4d7025e8c2fbe47bfaba4766f
parentb1967c9b50d5f445ccdbd62eb7ced8a898ece14c
Merge r1583191, r1584098, r1584665, r1591401 from trunk:

mod_ssl: send OCSP request's nonce according to SSLOCSPUseRequestNonce on/off. PR 56233.

mod_ssl: follow up to r1583191.

New SSLOCSPUseRequestNonce directive's manual and CHANGES.

Non functional code changes (modssl_ctx_t's field ocsp_use_request_nonce
grouped with other OCSP ones, nested if turned to a single AND condition).

Remove SSLOCSPUseRequestNonce OpenSSL-0.9.7 requirement (0.9.8 already required by httpd-2.4) and set availability to 2.5-dev until further notice.

mod_ssl: follow up to r1583191.

Use type BOOL for modssl_ctx_t's field ocsp_use_request_nonce.
Suggested by: kbrand.

Submitted by: ylavic
Reviewed/backported by: jim

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