You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2018/03/16 15:48:27 UTC
svn commit: r1827003 - /httpd/httpd/patches/2.4.x/ssl-ocsp-enable-leaf.patch
Author: icing
Date: Fri Mar 16 15:48:27 2018
New Revision: 1827003
URL: http://svn.apache.org/viewvc?rev=1827003&view=rev
Log:
adding r1827001
Modified:
httpd/httpd/patches/2.4.x/ssl-ocsp-enable-leaf.patch
Modified: httpd/httpd/patches/2.4.x/ssl-ocsp-enable-leaf.patch
URL: http://svn.apache.org/viewvc/httpd/httpd/patches/2.4.x/ssl-ocsp-enable-leaf.patch?rev=1827003&r1=1827002&r2=1827003&view=diff
==============================================================================
--- httpd/httpd/patches/2.4.x/ssl-ocsp-enable-leaf.patch (original)
+++ httpd/httpd/patches/2.4.x/ssl-ocsp-enable-leaf.patch Fri Mar 16 15:48:27 2018
@@ -1,6 +1,6 @@
Index: docs/manual/mod/mod_ssl.xml
===================================================================
---- docs/manual/mod/mod_ssl.xml (revision 1826995)
+--- docs/manual/mod/mod_ssl.xml (revision 1827002)
+++ docs/manual/mod/mod_ssl.xml (working copy)
@@ -2298,7 +2298,7 @@
<directivesynopsis>
@@ -23,7 +23,7 @@ Index: docs/manual/mod/mod_ssl.xml
itself, or derived by configuration; see the
Index: modules/ssl/mod_ssl.c
===================================================================
---- modules/ssl/mod_ssl.c (revision 1826995)
+--- modules/ssl/mod_ssl.c (revision 1827002)
+++ modules/ssl/mod_ssl.c (working copy)
@@ -243,8 +243,8 @@
"request body if a per-location SSL renegotiation is required due to "
@@ -38,7 +38,7 @@ Index: modules/ssl/mod_ssl.c
SSL_CMD_SRV(OCSPOverrideResponder, FLAG,
Index: modules/ssl/ssl_engine_config.c
===================================================================
---- modules/ssl/ssl_engine_config.c (revision 1826995)
+--- modules/ssl/ssl_engine_config.c (revision 1827002)
+++ modules/ssl/ssl_engine_config.c (working copy)
@@ -137,8 +137,8 @@
mctx->auth.verify_depth = UNSET;
@@ -72,7 +72,7 @@ Index: modules/ssl/ssl_engine_config.c
+ const char *w;
+
+ w = ap_getword_conf(parms->temp_pool, &arg);
-+ if (strcEQ(w, "none")) {
++ if (strcEQ(w, "off")) {
+ *mask = SSL_OCSPCHECK_NONE;
+ }
+ else if (strcEQ(w, "leaf")) {
@@ -127,7 +127,7 @@ Index: modules/ssl/ssl_engine_config.c
+
Index: modules/ssl/ssl_engine_init.c
===================================================================
---- modules/ssl/ssl_engine_init.c (revision 1826995)
+--- modules/ssl/ssl_engine_init.c (revision 1827002)
+++ modules/ssl/ssl_engine_init.c (working copy)
@@ -901,6 +901,10 @@
char *cfgp = mctx->pkp ? "SSLProxy" : "SSL";
@@ -142,7 +142,7 @@ Index: modules/ssl/ssl_engine_init.c
}
Index: modules/ssl/ssl_engine_kernel.c
===================================================================
---- modules/ssl/ssl_engine_kernel.c (revision 1826995)
+--- modules/ssl/ssl_engine_kernel.c (revision 1827002)
+++ modules/ssl/ssl_engine_kernel.c (working copy)
@@ -1578,7 +1578,6 @@
int errdepth = X509_STORE_CTX_get_error_depth(ctx);
@@ -164,7 +164,7 @@ Index: modules/ssl/ssl_engine_kernel.c
* missing/untrusted. Fail in that case. */
Index: modules/ssl/ssl_engine_ocsp.c
===================================================================
---- modules/ssl/ssl_engine_ocsp.c (revision 1826995)
+--- modules/ssl/ssl_engine_ocsp.c (revision 1827002)
+++ modules/ssl/ssl_engine_ocsp.c (working copy)
@@ -139,7 +139,14 @@
@@ -184,7 +184,7 @@ Index: modules/ssl/ssl_engine_ocsp.c
request = create_request(ctx, cert, &certID, s, pool, sc);
Index: modules/ssl/ssl_private.h
===================================================================
---- modules/ssl/ssl_private.h (revision 1826995)
+--- modules/ssl/ssl_private.h (revision 1827002)
+++ modules/ssl/ssl_private.h (working copy)
@@ -418,6 +418,16 @@
} ssl_crlcheck_t;
@@ -223,11 +223,11 @@ Index: modules/ssl/ssl_private.h
/* Declare OCSP Responder Certificate Verification Directive */
Index: .
===================================================================
---- . (revision 1826995)
+--- . (revision 1827002)
+++ . (working copy)
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
- Merged /httpd/httpd/trunk:r1826995
+ Merged /httpd/httpd/trunk:r1827001