www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

mod_substitute: follow up r1688339.

Browse Source 
SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697013 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-08-21 15:46:33 +00:00
parent 154ff59e2f
commit 41ec925666
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/filters/mod_substitute.c
View File

@@ -90,13 +90,13 @@ static void *merge_substitute_dcfg(apr_pool_t *p, void *basev, void *overv)
a->inherit_before = (over->inherit_before != -1)
? over->inherit_before
: base->inherit_before;
/* SubstituteInheritBefore was the default behavior until 2.5.x,
* and may be re-enabled as desired; this original default behavior
* was to apply inherited subst patterns before locally scoped patterns.
/* SubstituteInheritBefore wasn't the default behavior until 2.5.x,
* and may be re-disabled as desired; the original default behavior
* was to apply inherited subst patterns after locally scoped patterns.
* In later 2.2 and 2.4 versions, SubstituteInheritBefore may be toggled
* 'off' to follow the corrected/expected behavior, without violating POLS.
* 'on' to follow the corrected/expected behavior, without violating POLS.
*/
if (a->inherit_before == 1) {
if (a->inherit_before) {
a->patterns = apr_array_append(p, base->patterns,
over->patterns);
}