diff options
author | Yann Ylavic <ylavic@apache.org> | 2015-06-26 07:38:39 +0000 |
---|---|---|
committer | Yann Ylavic <ylavic@apache.org> | 2015-06-26 07:38:39 +0000 |
commit | 342cb635e9baf609c42cec50ff92aa65c87eca01 (patch) | |
tree | 7eee47234da7cc481c1c9226e914e8fe643ca843 | |
parent | 8c948d591c96789a74a5d8f914794fae1996ef6b (diff) | |
download | httpd-342cb635e9baf609c42cec50ff92aa65c87eca01.tar.gz |
Update mod_substitute proposal with r1687539 and r1687680, plus the backport patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687697 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | STATUS | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -105,11 +105,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] - *) mod_substitute: Fix configuraton merge order. PR 57641 + *) mod_substitute: Configure patterns merge order. PR 57641 trunk patch: http://svn.apache.org/r1684900 - 2.4.x patch: trunk works (modulo CHANGES) - +1: ylavic, minfrin - -1: wrowe [not without user control, we don't break working 2.2 configs] + http://svn.apache.org/r1687539 + http://svn.apache.org/r1687680 + 2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v2.patch + +1: ylavic + ylavic: SubstituteInheritBefore allows to configure the merge order; + the default is Off in trunk (2.5+), but still On in 2.4.x thanks to + the changes in the backport patch only + => over->inherit_before = (base->inherit_before != 0) instead + of (base->inherit_before > 0), plus the doc updated accordingly. PATCHES/ISSUES THAT ARE STALLED |