Re: svn commit: r1891730 - /httpd/httpd/branches/2.4.x/STATUS

2021-07-23 Thread Yann Ylavic
On Fri, Jul 23, 2021 at 9:05 AM Ruediger Pluem  wrote:
>
> Thanks Yann. Have you thought about using the scripts at 
> http://svn.apache.org/viewvc/httpd/dev-tools/github/ for
> such a complex backport proposal? Setting this up as a PR against 2.4.x 
> ensures that github automatically
> checks for mergebility and executes the test suite against it. Further more 
> the patch URL stays stable if you
> need to add further patches to the proposal / PR.
> And the scripts take care of the svn merge --record-only stuff :-)

Nice, conflicts resolved while cherry picking, script restarted after
each resolution, same result finally, great stuff!
The hub command failed (probably because I authenticate to github
using a yubikey) so I had to manually create the PR, but I can live
with this :)
Somehow the ci does not start though :/

Thanks RĂ¼diger, nice tools.

Cheers;
Yann.


Re: svn commit: r1891730 - /httpd/httpd/branches/2.4.x/STATUS

2021-07-23 Thread Ruediger Pluem



On 7/22/21 7:35 PM, yla...@apache.org wrote:
> Author: ylavic
> Date: Thu Jul 22 17:35:21 2021
> New Revision: 1891730
> 
> URL: http://svn.apache.org/viewvc?rev=1891730=rev
> Log:
> Propose [skip ci].
> 
> 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=1891730=1891729=1891730=diff
> ==
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu Jul 22 17:35:21 2021
> @@ -247,6 +247,31 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>
> https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/194.patch
>   +1: jfclere:
>  
> +  *) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
> +balancer-manager, which can lead to a crash.
> + trunk patch: http://svn.apache.org/r1891477
> +  http://svn.apache.org/r1891591
> + 2.4.x patch: svn merge -c 1891477,1891591 ^/httpd/httpd/trunk .
> + +1: ylavic,
> +
> +  *) mpm_event: Fix graceful stop/restart of children processes if 
> connections
> +are in lingering close for too long.
> + trunk patch: http://svn.apache.org/r1891716
> +  http://svn.apache.org/r1891717
> +  http://svn.apache.org/r1891718
> +  http://svn.apache.org/r1891719
> +  http://svn.apache.org/r1891721
> +  http://svn.apache.org/r1891724
> +  http://svn.apache.org/r1891726
> +  http://svn.apache.org/r1891727
> +  http://svn.apache.org/r1891728
> + backport: wget 
> http://people.apache.org/~ylavic/patches/2.4.x-mpm_event_graceful_linger.patch
> + + patch -p0 < 2.4.x-mpm_event_graceful_linger.patch
> + + svn merge --record-only -c 
> 1891716-1891719,1891721,1891724,1891726-1891727 ^/httpd/httpd/trunk .
> + + svn merge -c 1891728 ^/httpd/httpd/trunk .
> + + make update-changes
> + +1: ylavic,


Thanks Yann. Have you thought about using the scripts at 
http://svn.apache.org/viewvc/httpd/dev-tools/github/ for
such a complex backport proposal? Setting this up as a PR against 2.4.x ensures 
that github automatically
checks for mergebility and executes the test suite against it. Further more the 
patch URL stays stable if you
need to add further patches to the proposal / PR.
And the scripts take care of the svn merge --record-only stuff :-)

Regards

RĂ¼diger



Re: svn commit: r1891730 - /httpd/httpd/branches/2.4.x/STATUS

2021-07-23 Thread ste...@eissing.org
Will throw this into my testsuite shredder today. Thank Yann, for bringing this 
in!

> Am 22.07.2021 um 19:35 schrieb yla...@apache.org:
> 
> Author: ylavic
> Date: Thu Jul 22 17:35:21 2021
> New Revision: 1891730
> 
> URL: http://svn.apache.org/viewvc?rev=1891730=rev
> Log:
> Propose [skip ci].
> 
> 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=1891730=1891729=1891730=diff
> ==
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu Jul 22 17:35:21 2021
> @@ -247,6 +247,31 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>   
> https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/194.patch
>  +1: jfclere:
> 
> +  *) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
> +balancer-manager, which can lead to a crash.
> + trunk patch: http://svn.apache.org/r1891477
> +  http://svn.apache.org/r1891591
> + 2.4.x patch: svn merge -c 1891477,1891591 ^/httpd/httpd/trunk .
> + +1: ylavic,
> +
> +  *) mpm_event: Fix graceful stop/restart of children processes if 
> connections
> +are in lingering close for too long.
> + trunk patch: http://svn.apache.org/r1891716
> +  http://svn.apache.org/r1891717
> +  http://svn.apache.org/r1891718
> +  http://svn.apache.org/r1891719
> +  http://svn.apache.org/r1891721
> +  http://svn.apache.org/r1891724
> +  http://svn.apache.org/r1891726
> +  http://svn.apache.org/r1891727
> +  http://svn.apache.org/r1891728
> + backport: wget 
> http://people.apache.org/~ylavic/patches/2.4.x-mpm_event_graceful_linger.patch
> + + patch -p0 < 2.4.x-mpm_event_graceful_linger.patch
> + + svn merge --record-only -c 
> 1891716-1891719,1891721,1891724,1891726-1891727 ^/httpd/httpd/trunk .
> + + svn merge -c 1891728 ^/httpd/httpd/trunk .
> + + make update-changes
> + +1: ylavic,
> +
> 
> PATCHES/ISSUES THAT ARE BEING WORKED
>   [ New entries should be added at the START of the list ]
> 
>