Commit 6a73670a authored by Joe Orton's avatar Joe Orton
Browse files

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
parent 3f4766c9

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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

modules/ssl/ssl_engine_ocsp.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {