]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c0ecaab) | patch
Merge r1585919 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 17 Apr 2014 13:37:04 +0000 (13:37 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 17 Apr 2014 13:37:04 +0000 (13:37 +0000)
commit9f53d0c4f3baad7074b3be8ca47a6cdf1d342c42
treef26692a146d518d45a883d608d43d4baeb8d4c51tree | snapshot
parentc0ecaab949c571938b96242aacb7adbe6ce72515commit | diff
Merge r1585919 from trunk:

Reverse the order when merging global and vhost-level config arrays.
Putting the vhost-level elements last allows overriding global settings
(for the deprecated SSLRequire directive, the order is irrelevant,
all of them must be met, cf. ssl_engine_kernel.c:ssl_hook_Access).

Submitted by: kbrand
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588245 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.