* Promote

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

diff --git a/STATUS b/STATUS
index e96a9eb25be9c39cc500b8ba93cd2ae457e4d4ab..99782c0e8b98360ad542b40bbb9dd73ff26afa57 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -85,6 +85,22 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_proxy_balancer: Add in forced recovery for balancer
+     members if all are in error state.
+     Trunk version of patch:
+        http://svn.apache.org/viewcvs.cgi?rev=451572&view=rev
+     Backport version for 2.2.x of patch:
+        http://people.apache.org/~jim/patches/proxy-force-recovery.patch.txt
+     +1: jim, rpluem, jfclere
+
+    * mod_proxy_ajp: Do not fail if response data is sent before all request
+      data is read.  PR 45911
+      Trunk version of patch:
+         http://svn.apache.org/viewvc?rev=709666&view=rev
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works
+      +1: rpluem, jim, jfclere
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -118,14 +134,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rpluem says: The patch to ap_mmn.h does only contain the comment, but does
      not change the #define. Once this is fixed I am +1.
 
-   * mod_proxy_balancer: Add in forced recovery for balancer
-     members if all are in error state.
-     Trunk version of patch:
-        http://svn.apache.org/viewcvs.cgi?rev=451572&view=rev
-     Backport version for 2.2.x of patch:
-        http://people.apache.org/~jim/patches/proxy-force-recovery.patch.txt
-     +1: jim, rpluem, jfclere
-
    * Build: Correctly set SSL_LIBS during openssl detection if pkgconfig
      is not available. This fixes a regression against 2.2.9.
      PR 46018
@@ -135,14 +143,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         Trunk version of patch works
      +1: rpluem,
 
-    * mod_proxy_ajp: Do not fail if response data is sent before all request
-      data is read.  PR 45911
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=709666&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jim, jfclere
-
     * mod_cache: Convert age of cached object to seconds before comparing it to
       age supplied by the request when checking whether to send a Warning
       header for a stale response. PR 39713.