]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose [skip ci].
authorYann Ylavic <ylavic@apache.org>
Thu, 22 Jul 2021 17:35:21 +0000 (17:35 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 22 Jul 2021 17:35:21 +0000 (17:35 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1891730 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 801a3c796ba7a3436efd623d5160c78f2ed0fedb..f48f2067025ba436e638d796c89fa77ebbf0e49e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]