]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
mod_ssl: Correctly merge configurations that have client certificates set
authorRainer Jung <rjung@apache.org>
Thu, 18 Oct 2018 10:06:37 +0000 (10:06 +0000)
committerRainer Jung <rjung@apache.org>
Thu, 18 Oct 2018 10:06:37 +0000 (10:06 +0000)
commit0bba95406ca1d0d6c59fbf0dec997cf7ecc38dac
tree98e0395b15997c9f8b7c64adc6f0e6f821c1f4d6
parent33c014d8c7cb1acc87b3fa3853c9297053292c35
mod_ssl: 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 (backported in r1824187).

Backport of r1844002 from trunk.

Submitted by: rjung
Reviewed by: rjung, rpluem, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1844226 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/ssl/ssl_engine_config.c