From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Jan 2008 16:18:58 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.9~393
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b08139a1e84b16a7b7aaf340fdbab500bbdf324;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 01e0fd5726d..dbdb347c40c 100644
--- a/STATUS
+++ b/STATUS
@@ -81,6 +81,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_proxy_ajp: Use a sufficient size for AJP CPING / CPONG messages.
+    Otherwise CPING / CPONG tests will always fail.
+    PR: 43504
+      Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=467259
+         http://svn.apache.org/viewvc?view=rev&revision=467274
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works
+      +1: rpluem, trawick, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -124,16 +134,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   should be fixed / discussed in trunk before we backport.
       -1: wrowe until the next release is out the door
 
-  * mod_proxy_ajp: Use a sufficient size for AJP CPING / CPONG messages.
-    Otherwise CPING / CPONG tests will always fail.
-    PR: 43504
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=467259
-         http://svn.apache.org/viewvc?view=rev&revision=467274
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, trawick, jim
-
   * mod_proxy_http: Return HTTP status codes instead of apr_status_t
     values for errors encountered while forwarding the request body
       Trunk version of patch: