From: Stefan Eissing <icing@apache.org>
Date: Tue, 2 Mar 2021 15:39:23 +0000 (+0000)
Subject: vote and promote. [skip ci]
X-Git-Tag: 2.4.47~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9fcb966e486c6324332990af91cd7c1aea6e0a7;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote. [skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1887092 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index cca09307aa9..c4bdcb78c41 100644
--- a/STATUS
+++ b/STATUS
@@ -185,6 +185,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/170.diff
      +1: rpluem, ylavic, icing
 
+  *) mod_proxy_hcheck: Don't pile up health checks if the previous one did
+     not finish before hcinterval.  PR 63010.
+     trunk patch: http://svn.apache.org/r1885691
+     2.4.x patch: svn merge -c 1885691 ^/httpd/httpd/trunk .
+     +1: ylavic, covener, icing
+
+  *) mod_proxy_http, core: Fixes against 2.4.x's r1885239 and r1885573, the
+     former for declining CONNECT requests in mod_proxy_http, the latter for
+     ignored poll timeouts and errors in the core output filter.
+     trunk patch: http://svn.apache.org/r1886141
+                  http://svn.apache.org/r1886151
+     2.4.x patch: http://home.apache.org/~ylavic/patches/follow_up_to_r1885239_and_r1885573-v2.patch
+                  (includes follow up to r1885573 which is 2.4.x only)
+     +1: ylavic, covener, icing
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -219,12 +234,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
     +1: minfrin
 
-  *) mod_proxy_hcheck: Don't pile up health checks if the previous one did
-     not finish before hcinterval.  PR 63010.
-     trunk patch: http://svn.apache.org/r1885691
-     2.4.x patch: svn merge -c 1885691 ^/httpd/httpd/trunk .
-     +1: ylavic, covener
-
   *) mod_http2: explicitely apr_thread_exit() at the end of slot_run(), and
                 fix workers synchronization on pchild cleanup.
      trunk patch: http://svn.apache.org/r1883668
@@ -233,15 +242,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: ylavic, icing
      ylavic: jorton's vote reset after adding r1886255
 
-  *) mod_proxy_http, core: Fixes against 2.4.x's r1885239 and r1885573, the
-     former for declining CONNECT requests in mod_proxy_http, the latter for
-     ignored poll timeouts and errors in the core output filter.
-     trunk patch: http://svn.apache.org/r1886141
-                  http://svn.apache.org/r1886151
-     2.4.x patch: http://home.apache.org/~ylavic/patches/follow_up_to_r1885239_and_r1885573-v2.patch
-                  (includes follow up to r1885573 which is 2.4.x only)
-     +1: ylavic, covener
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]