From: Jim Jagielski <jim@apache.org>
Date: Mon, 27 Oct 2008 14:11:03 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.2.11~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9ef70327b9016c50bd2cd9c202d2320f25f4576;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index eeb6e0132ec..fa3c81ad87b 100644
--- a/STATUS
+++ b/STATUS
@@ -85,6 +85,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * proxy_ajp: ap_proxy_determine_connection modifies the url if we are
+       retrying the result we should retry using the orginal url.
+        http://svn.apache.org/viewvc?rev=706318&view=rev
+     +1: jfclere, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -129,11 +133,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~tdonovan/diffs/windows_odbc_22x_dsw.patch
      +1: tdonovan, wrowe
 
-   * proxy_ajp: ap_proxy_determine_connection modifies the url if we are
-       retrying the result we should retry using the orginal url.
-        http://svn.apache.org/viewvc?rev=706318&view=rev
-     +1: jfclere, rpluem, jim
-
    * mod_proxy_ajp: Always send body (zero size at least) whenever C-L is
      present in the request.
      Trunk version of patch: