From: Joe Orton <jorton@apache.org>
Date: Mon, 23 Jul 2018 08:54:29 +0000 (+0000)
Subject: Merge r1555631 from trunk:
X-Git-Tag: 2.4.35~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff71be64ee0b0ffec6b4230635954455deef7f24;p=apache

Merge r1555631 from trunk:

Fix config merging of SSLOCSPEnable and SSLOCSPOverrideResponder.

Submitted by: trawick, Frank Meier <frank.meier ergon.ch>
Reviewed by: rpluem, ylavic, jorton


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

diff --git a/CHANGES b/CHANGES
index 35a1469d11..f01b79eb30 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.35
 
+  *) mod_ssl: Fix merging of SSLOCSPOverrideResponder.  [Jeff Trawick,
+     [Frank Meier <frank meier ergon.ch>]
+
   *) mod_proxy_balancer: Restore compatibility with APR 1.4.  [Joe Orton]
 
 Changes with Apache 2.4.34
diff --git a/modules/ssl/ssl_engine_ocsp.c b/modules/ssl/ssl_engine_ocsp.c
index bfb8952bf4..ef92c372c1 100644
--- a/modules/ssl/ssl_engine_ocsp.c
+++ b/modules/ssl/ssl_engine_ocsp.c
@@ -61,7 +61,7 @@ static apr_uri_t *determine_responder_uri(SSLSrvConfigRec *sc, X509 *cert,
     /* Use default responder URL if forced by configuration, else use
      * certificate-specified responder, falling back to default if
      * necessary and possible. */
-    if (sc->server->ocsp_force_default) {
+    if (sc->server->ocsp_force_default == TRUE) {
         s = sc->server->ocsp_responder;
     }
     else {