vote, promote

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

diff --git a/STATUS b/STATUS
index 57882252677dd865b28194523f33319e68f85c41..c2a0c21a21f0a4bbc004bd7592d2aeb9f76e3f8c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -85,6 +85,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_proxy_http: Do not close the connection to the client if the reading
+     of a response from the backend failed due to a timeout.
+     [Adam Woodworth <mirkperl gmail.com>]
+    Trunk version of patch:
+       http://svn.apache.org/viewvc?rev=697362&view=rev
+    Backport version for 2.2.x of patch:
+       Trunk version of patch works
+   +1: rpluem, jim, covener
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -107,15 +115,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       -1: rpluem: jorton found some problems with the trunk version and they
                   should be fixed / discussed in trunk before we backport.
 
-   * mod_proxy_http: Do not close the connection to the client if the reading
-     of a response from the backend failed due to a timeout.
-     [Adam Woodworth <mirkperl gmail.com>]
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=697362&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-   +1: rpluem, jim
-
    * mod_proxy: Allow for the smax param to be 0, so that all connections
      are available to be dropped, should they be idle long enough.
      PR 43371