httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yann Ylavic <ylavic....@gmail.com>
Subject Re: svn commit: r1684900 - in /httpd/httpd/trunk: CHANGES modules/filters/mod_substitute.c
Date Wed, 24 Jun 2015 21:04:38 GMT
I think we need that yes (backport probably proposed the too early).
Would something like SubstituteBaseFirst (server scope), on by default
on 2.4.x and off on trunk, be OK?
Maybe a better name?

On Wed, Jun 24, 2015 at 10:03 PM, Eric Covener <covener@gmail.com> wrote:
> For 2.4, do we need some kind of global property for people who were
> already working around the merge?
>
> On Thu, Jun 11, 2015 at 10:22 AM,  <niq@apache.org> wrote:
>> Author: niq
>> Date: Thu Jun 11 14:22:21 2015
>> New Revision: 1684900
>>
>> URL: http://svn.apache.org/r1684900
>> Log:
>> mod_substitute: Fix configuraton merge order.
>> PR 57641 [Marc.Stern]
>>
>> Modified:
>>     httpd/httpd/trunk/CHANGES
>>     httpd/httpd/trunk/modules/filters/mod_substitute.c
>>
>> Modified: httpd/httpd/trunk/CHANGES
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1684900&r1=1684899&r2=1684900&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/CHANGES [utf-8] (original)
>> +++ httpd/httpd/trunk/CHANGES [utf-8] Thu Jun 11 14:22:21 2015
>> @@ -1,6 +1,9 @@
>>                                                           -*- coding: utf-8 -*-
>>  Changes with Apache 2.5.0
>>
>> +  *) mod_substitute: Fix configuraton merge order.
>> +     PR 57641 [<Marc.Stern approach.be>]
>> +
>>    *) core: Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
>>       authorized characters.  [Yann Ylavic]
>>
>>
>> Modified: httpd/httpd/trunk/modules/filters/mod_substitute.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_substitute.c?rev=1684900&r1=1684899&r2=1684900&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/filters/mod_substitute.c (original)
>> +++ httpd/httpd/trunk/modules/filters/mod_substitute.c Thu Jun 11 14:22:21 2015
>> @@ -84,8 +84,8 @@ static void *merge_substitute_dcfg(apr_p
>>      subst_dir_conf *base = (subst_dir_conf *) basev;
>>      subst_dir_conf *over = (subst_dir_conf *) overv;
>>
>> -    a->patterns = apr_array_append(p, over->patterns,
>> -                                                  base->patterns);
>> +    a->patterns = apr_array_append(p, base->patterns,
>> +                                                  over->patterns);
>>      a->max_line_length = over->max_line_length_set ?
>>                           over->max_line_length : base->max_line_length;
>>      a->max_line_length_set = over->max_line_length_set ?
>>
>>
>
>
>
> --
> Eric Covener
> covener@gmail.com

Mime
View raw message