Commit ce8ee35d authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Correctly merge configurations that have client certificates set 

  by SSLProxyMachineCertificate{File|Path}.
  The certificates and keys loaded during configuration time got lost during
  runtime if e.g. SSLProxyMachineCertificate{File|Path} was set on virtual host
  level and there was an SSL directive at directory level, e.g. SSLRequire.
  This fixes a regression likely introduced in r1740928.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1844002 13f79535-47bb-0310-9956-ffa450edef68
parent b0cd0298

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) mod_ssl: Correctly merge configurations that have client certificates set

     by SSLProxyMachineCertificate{File|Path}. [Ruediger Pluem]



  *) core: Ensure that aborted connections are logged as such. PR 62823

     [Arnaud Grandville <contact@grandville.net>]

modules/ssl/ssl_engine_config.c

+2 −0
Changes for modules/ssl/ssl_engine_config.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -433,6 +433,8 @@ static void modssl_ctx_cfg_merge_proxy(apr_pool_t *p, 
    cfgMergeString(pkp->cert_file);

    cfgMergeString(pkp->cert_path);

    cfgMergeString(pkp->ca_cert_file);

    cfgMergeString(pkp->certs);

    cfgMergeString(pkp->ca_certs);

}



void *ssl_config_perdir_merge(apr_pool_t *p, void *basev, void *addv)