Re: svn commit: r1859376 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_reqtimeout.c

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1859376 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_reqtimeout.c

Rainer Jung
This and the previous change I forgot to first move to the accepted
section in STATUS. They had enough votes (for quite some time), so I
hope it is OK to shortcut the procedure for now. It was only an oversight.

Thanks (and sorry),

Rainer

Am 16.05.2019 um 15:09 schrieb [hidden email]:

> Author: rjung
> Date: Thu May 16 13:09:35 2019
> New Revision: 1859376
>
> URL: http://svn.apache.org/viewvc?rev=1859376&view=rev
> Log:
> mod_reqtimeout: Fix default rates missing (not applied) in 2.4.39.
> PR 63325.
>
> Backport of r1857129 + r1857130 from trunk.
> Proposed by: ylavic
> Backported by: rjung
> Reviewed by: ylavic, rpluem, jim
>
> Modified:
>      httpd/httpd/branches/2.4.x/   (props changed)
>      httpd/httpd/branches/2.4.x/CHANGES
>      httpd/httpd/branches/2.4.x/STATUS
>      httpd/httpd/branches/2.4.x/modules/filters/mod_reqtimeout.c
>
> Propchange: httpd/httpd/branches/2.4.x/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu May 16 13:09:35 2019
> @@ -8,4 +8,4 @@
>   /httpd/httpd/branches/trunk-md:1804087-1804529
>   /httpd/httpd/branches/trunk-override-index:1793921-1793931
>   /httpd/httpd/branches/wombat-integration:723609-723841
>...
>
> Modified: httpd/httpd/branches/2.4.x/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1859376&r1=1859375&r2=1859376&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
> +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu May 16 13:09:35 2019
> @@ -1,6 +1,9 @@
>                                                            -*- coding: utf-8 -*-
>   Changes with Apache 2.4.40
>  
> +  *) mod_reqtimeout: Fix default rates missing (not applied) in 2.4.39.
> +     PR 63325. [Yann Ylavic]
> +
>     *) mod_info: Fix output of server settings for PIPE_BUF in mod_info in
>        the rare case that PIPE_BUF is defined. [Rainer Jung]
>  
>
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1859376&r1=1859375&r2=1859376&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu May 16 13:09:35 2019
> @@ -215,12 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>        2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v5.patch
>        +1: ylavic, jim
>  
> -  *) mod_reqtimeout: Fix default rates missing in 2.4.39. PR 63325
> -     trunk patch: http://svn.apache.org/r1857129
> -                  http://svn.apache.org/r1857130
> -     2.4.x patch: svn merge -c 1857129,1857130 ^/httpd/httpd/trunk .
> -     +1: ylavic, rpluem, jim
> -
>     *) mod_status: PR60647: ACC per connection not available w/ event MPM
>        trunk patch: http://svn.apache.org/r1780280
>        2.4.x patch: svn merge -c 1780280 ^/httpd/httpd/trunk .
>
...
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1859376 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_reqtimeout.c

Ruediger Pluem
No worries from my point of view. Trail is still clear.

Regards

RĂ¼diger

On 05/16/2019 03:20 PM, Rainer Jung wrote:

> This and the previous change I forgot to first move to the accepted section in STATUS. They had enough votes (for quite
> some time), so I hope it is OK to shortcut the procedure for now. It was only an oversight.
>
> Thanks (and sorry),
>
> Rainer
>
> Am 16.05.2019 um 15:09 schrieb [hidden email]:
>> Author: rjung
>> Date: Thu May 16 13:09:35 2019
>> New Revision: 1859376
>>
>> URL: http://svn.apache.org/viewvc?rev=1859376&view=rev
>> Log:
>> mod_reqtimeout: Fix default rates missing (not applied) in 2.4.39.
>> PR 63325.
>>
>> Backport of r1857129 + r1857130 from trunk.
>> Proposed by: ylavic
>> Backported by: rjung
>> Reviewed by: ylavic, rpluem, jim
>>
>> Modified:
>>      httpd/httpd/branches/2.4.x/   (props changed)
>>      httpd/httpd/branches/2.4.x/CHANGES
>>      httpd/httpd/branches/2.4.x/STATUS
>>      httpd/httpd/branches/2.4.x/modules/filters/mod_reqtimeout.c
>>
>> Propchange: httpd/httpd/branches/2.4.x/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Thu May 16 13:09:35 2019
>> @@ -8,4 +8,4 @@
>>   /httpd/httpd/branches/trunk-md:1804087-1804529
>>   /httpd/httpd/branches/trunk-override-index:1793921-1793931
>>   /httpd/httpd/branches/wombat-integration:723609-723841
>> ...
>>
>> Modified: httpd/httpd/branches/2.4.x/CHANGES
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1859376&r1=1859375&r2=1859376&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
>> +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu May 16 13:09:35 2019
>> @@ -1,6 +1,9 @@
>>                                                            -*- coding: utf-8 -*-
>>   Changes with Apache 2.4.40
>>   +  *) mod_reqtimeout: Fix default rates missing (not applied) in 2.4.39.
>> +     PR 63325. [Yann Ylavic]
>> +
>>     *) mod_info: Fix output of server settings for PIPE_BUF in mod_info in
>>        the rare case that PIPE_BUF is defined. [Rainer Jung]
>>  
>> Modified: httpd/httpd/branches/2.4.x/STATUS
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1859376&r1=1859375&r2=1859376&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/STATUS (original)
>> +++ httpd/httpd/branches/2.4.x/STATUS Thu May 16 13:09:35 2019
>> @@ -215,12 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>>        2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v5.patch
>>        +1: ylavic, jim
>>   -  *) mod_reqtimeout: Fix default rates missing in 2.4.39. PR 63325
>> -     trunk patch: http://svn.apache.org/r1857129
>> -                  http://svn.apache.org/r1857130
>> -     2.4.x patch: svn merge -c 1857129,1857130 ^/httpd/httpd/trunk .
>> -     +1: ylavic, rpluem, jim
>> -
>>     *) mod_status: PR60647: ACC per connection not available w/ event MPM
>>        trunk patch: http://svn.apache.org/r1780280
>>        2.4.x patch: svn merge -c 1780280 ^/httpd/httpd/trunk .
>>
> ...
>