]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Vote and promote
authorRuediger Pluem <rpluem@apache.org>
Wed, 8 Sep 2021 06:50:31 +0000 (06:50 +0000)
committerRuediger Pluem <rpluem@apache.org>
Wed, 8 Sep 2021 06:50:31 +0000 (06:50 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893098 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 97559d96adbb8910c5e5263b9fe4ac38bf661f1c..a711cb93e09211123d9cbb4fd65af479743e751a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -168,6 +168,19 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~ylavic/patches/ap_filter_input_pending-unused.patch
      +1: ylavic, icing,  covener
 
+  *) mpm_event: Fix children processes possibly not stopped on graceful
+     restart.  PR 63169
+     trunk patch: http://svn.apache.org/r1893014
+     trunk patch: http://svn.apache.org/r1893073
+     2.4.x patch: svn merge -c 1893014,1893073 ^/httpd/httpd/trunk .
+     +1: ylavic, covener, rpluem
+
+  *) mod_proxy: Don't canonicalize with both nocanon and ProxyPassInterpolateEnv
+     On.  PR 65549.
+     trunk patch: http://svn.apache.org/r1893016
+     2.4.x patch: svn merge -c 1893016 ^/httpd/httpd/trunk .
+     +1: ylavic, covener, rpluem
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -210,20 +223,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1893004
      2.4.x patch: svn merge -c 1893001,1893002,1893004 ^/httpd/httpd/trunk .
                   Reusing CHANGES entry from r1892982.
-     +1: ylavic,
-
-  *) mpm_event: Fix children processes possibly not stopped on graceful
-     restart.  PR 63169
-     trunk patch: http://svn.apache.org/r1893014
-     trunk patch: http://svn.apache.org/r1893073
-     2.4.x patch: svn merge -c 1893014,1893073 ^/httpd/httpd/trunk .
-     +1: ylavic, covener
-
-  *) mod_proxy: Don't canonicalize with both nocanon and ProxyPassInterpolateEnv
-     On.  PR 65549.
-     trunk patch: http://svn.apache.org/r1893016
-     2.4.x patch: svn merge -c 1893016 ^/httpd/httpd/trunk .
-     +1: ylavic, covener
+     +1: ylavic, rpluem
 
   *) core: Initialize the request fields on read failure to avoid NULLs.
      trunk patch: http://svn.apache.org/r1893030