From 41ec925666f9e41c1cf0b471be7cf068d40b5fcf Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 21 Aug 2015 15:46:33 +0000 Subject: [PATCH] mod_substitute: follow up r1688339. 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 --- modules/filters/mod_substitute.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c index 8762197520..7370883fa7 100644 --- a/modules/filters/mod_substitute.c +++ b/modules/filters/mod_substitute.c @@ -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); } -- 2.50.1