promote

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

diff --git a/STATUS b/STATUS
index c16dcb38a195a314f0c31610274162d9455c0d1e..35a82121274cfe8e0b2943f491ad4c743841dcf9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -153,6 +153,19 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1898453 ^/httpd/httpd/trunk .
      +1: jaillect36, ylavic, rpluem
 
+  *) mod_proxy: Set a status code of 502 in case the backend just closed the
+     connection in reply to our forwarded request.
+     Trunk version of patch:
+        https://svn.apache.org/r1899451
+        https://svn.apache.org/r1899454
+        https://svn.apache.org/r1899562
+        https://svn.apache.org/r1899564
+        https://svn.apache.org/r1899584
+        https://svn.apache.org/r1899886
+     Backport version for 2.4.x of patch:
+       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/314.diff
+     Can be applied via apply_backport_pr.sh 314
+     +1: rpluem, ylavic, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -186,20 +199,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: I think "extra" should be an apr_size_t.
      icing: added r1899905 with the proposed changes and assertions.
 
-  *) mod_proxy: Set a status code of 502 in case the backend just closed the
-     connection in reply to our forwarded request.
-     Trunk version of patch:
-        https://svn.apache.org/r1899451
-        https://svn.apache.org/r1899454
-        https://svn.apache.org/r1899562
-        https://svn.apache.org/r1899564
-        https://svn.apache.org/r1899584
-        https://svn.apache.org/r1899886
-     Backport version for 2.4.x of patch:
-       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/314.diff
-     Can be applied via apply_backport_pr.sh 314
-     +1: rpluem, ylavic, jim
-
   *) mod_proxy: Add backend port to log messages to
      ease identification of involved service.
      trunk patches: https://svn.apache.org/r1900028