You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2015/06/25 17:47:40 UTC
svn commit: r1687564 - /httpd/httpd/branches/2.4.x/STATUS
Author: ylavic
Date: Thu Jun 25 15:47:39 2015
New Revision: 1687564
URL: http://svn.apache.org/r1687564
Log:
Update mod_substitute proposal with SubstituteInheritBefore.
Modified:
httpd/httpd/branches/2.4.x/STATUS
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1687564&r1=1687563&r2=1687564&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jun 25 15:47:39 2015
@@ -201,10 +201,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
ints added at the end of core_server_config, the proposed merge
does a minor bump only.
- *) 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
+ http://svn.apache.org/r1687539
+ 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore.patch
+ +1: ylavic
+ ylavic: added r1687539 and discarded minfrin's vote (we must preserve
+ the current behaviour). 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 (dcfg->inherit_before = 1 by default, and the doc is updated
+ accordingly).
*) core: Avoid a possible truncation of the faulty header included in the
HTML response when LimitRequestFieldSize is reached.
Re: svn commit: r1687564 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Yann Ylavic <yl...@gmail.com>.
Simpler indeed, thanks.
Addressed in r1687680 and backport proposal updated in r1687684.
Will update the one of 2.2.x too.
On Fri, Jun 26, 2015 at 2:01 AM, William A Rowe Jr <wr...@rowe-clan.net> wrote:
> Just a quick observation on the patch, you know you can use a tristate to
> avoid an int?
>
> Simply set the value to 2 in the config-create (the enum being off=0, on=1,
> unset=2), check for RHS 'unset' during the merge, and in the feature toggle
> test, explicitly check test for == of the non-default value.
>
> And a style nit, we explicitly put in the variable type for each member, and
> don't carry the type from member to member in the project's structs/enums.
>
>
>
> On Thu, Jun 25, 2015 at 10:47 AM, <yl...@apache.org> wrote:
>>
>> Author: ylavic
>> Date: Thu Jun 25 15:47:39 2015
>> New Revision: 1687564
>>
>> URL: http://svn.apache.org/r1687564
>> Log:
>> Update mod_substitute proposal with SubstituteInheritBefore.
>>
>> Modified:
>> httpd/httpd/branches/2.4.x/STATUS
>>
>> Modified: httpd/httpd/branches/2.4.x/STATUS
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1687564&r1=1687563&r2=1687564&view=diff
>>
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/STATUS (original)
>> +++ httpd/httpd/branches/2.4.x/STATUS Thu Jun 25 15:47:39 2015
>> @@ -201,10 +201,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>> ints added at the end of core_server_config, the proposed
>> merge
>> does a minor bump only.
>>
>> - *) 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
>> + http://svn.apache.org/r1687539
>> + 2.4.x patch:
>> http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore.patch
>> + +1: ylavic
>> + ylavic: added r1687539 and discarded minfrin's vote (we must
>> preserve
>> + the current behaviour). 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 (dcfg->inherit_before = 1 by default, and the doc is
>> updated
>> + accordingly).
>>
>> *) core: Avoid a possible truncation of the faulty header included in
>> the
>> HTML response when LimitRequestFieldSize is reached.
>>
>>
>
Re: svn commit: r1687564 - /httpd/httpd/branches/2.4.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
Just a quick observation on the patch, you know you can use a tristate to
avoid an int?
Simply set the value to 2 in the config-create (the enum being off=0, on=1,
unset=2), check for RHS 'unset' during the merge, and in the feature toggle
test, explicitly check test for == of the non-default value.
And a style nit, we explicitly put in the variable type for each member,
and don't carry the type from member to member in the project's
structs/enums.
On Thu, Jun 25, 2015 at 10:47 AM, <yl...@apache.org> wrote:
> Author: ylavic
> Date: Thu Jun 25 15:47:39 2015
> New Revision: 1687564
>
> URL: http://svn.apache.org/r1687564
> Log:
> Update mod_substitute proposal with SubstituteInheritBefore.
>
> Modified:
> httpd/httpd/branches/2.4.x/STATUS
>
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1687564&r1=1687563&r2=1687564&view=diff
>
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu Jun 25 15:47:39 2015
> @@ -201,10 +201,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
> ints added at the end of core_server_config, the proposed
> merge
> does a minor bump only.
>
> - *) 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
> + http://svn.apache.org/r1687539
> + 2.4.x patch:
> http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore.patch
> + +1: ylavic
> + ylavic: added r1687539 and discarded minfrin's vote (we must preserve
> + the current behaviour). 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 (dcfg->inherit_before = 1 by default, and the doc is
> updated
> + accordingly).
>
> *) core: Avoid a possible truncation of the faulty header included in
> the
> HTML response when LimitRequestFieldSize is reached.
>
>
>