From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 16 Oct 2018 12:55:01 +0000 (+0000)
Subject: * Correctly merge configurations that have client certificates set
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a51f5708cd3e7a7eacee3ad34ceeea6a9da3922f;p=thirdparty%2Fapache%2Fhttpd.git

* 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
---

diff --git a/CHANGES b/CHANGES
index 045c767eb14..5e4d4d49cfc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- 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>]
 
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index d26d0f0d647..3ded454b4c1 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -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)