From: Stefan Eissing <icing@apache.org>
Date: Tue, 2 Mar 2021 15:26:12 +0000 (+0000)
Subject: vote and promote
X-Git-Tag: 2.4.47~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d40961fcef88632623068bd55f55e859e9cbdb70;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@1887089 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 3295cbf5acd..9cb0ba83d67 100644
--- a/STATUS
+++ b/STATUS
@@ -176,6 +176,22 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      CI results:  https://travis-ci.com/github/apache/httpd/builds/213760432
      +1: jorton, ylavic, icing 
 
+  *) mod_proxy_ajp: If we face a timeout during receiving the response from the
+     backend and if we pinged it successfully before don't assume the whole
+     backend has failed. Assume that only the request has failed and return a
+     gateway timeout then.
+     Hint the changes to the other files in r1465839, r1530603, r1729507 were
+     already backported earlier.
+     Trunk version of patch:
+        https://svn.apache.org/r1398307
+        https://svn.apache.org/r1465839
+        https://svn.apache.org/r1530603
+        https://svn.apache.org/r1578759
+        https://svn.apache.org/r1729507
+     Backport version for 2.4.x of patch:
+        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/170.diff
+     +1: rpluem, ylavic, icing
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -233,22 +249,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   (includes follow up to r1885573 which is 2.4.x only)
      +1: ylavic, covener
 
-  *) mod_proxy_ajp: If we face a timeout during receiving the response from the
-     backend and if we pinged it successfully before don't assume the whole
-     backend has failed. Assume that only the request has failed and return a
-     gateway timeout then.
-     Hint the changes to the other files in r1465839, r1530603, r1729507 were
-     already backported earlier.
-     Trunk version of patch:
-        https://svn.apache.org/r1398307
-        https://svn.apache.org/r1465839
-        https://svn.apache.org/r1530603
-        https://svn.apache.org/r1578759
-        https://svn.apache.org/r1729507
-     Backport version for 2.4.x of patch:
-        https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/170.diff
-     +1: rpluem, ylavic,
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]