]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9a1641c) | patch
Merge r1828390 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 9 Apr 2018 15:30:50 +0000 (15:30 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 9 Apr 2018 15:30:50 +0000 (15:30 +0000)
commitba22522b6fd8611456b366dd0a031829239dcdca
tree4fce24b410f20c7d44e23a4febe5341a505b9417tree | snapshot
parent9a1641c89c41ea5a4130cf355f173377b61f5e93commit | diff
Merge r1828390 from trunk:

mod_ssl: Fix merging of proxy SSL context outside <Proxy> sections.

Regression introduced in 2.4.30. PR 62232.

The proxy SSL_CTX was not inherited from the vhost (the only available in
2.4.29) in/for any directory context besides <Proxy>...

Mostly debugged and fixed by Rainer, thanks!

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828735 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | history
STATUS diff | blob | history
modules/ssl/ssl_engine_config.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.