From: Jim Jagielski <jim@apache.org>
Date: Thu, 19 Nov 2009 14:05:59 +0000 (+0000)
Subject: approved
X-Git-Tag: 2.2.15~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d8d9f14dd0fff6958617b1bdb1a0e5e579ca19;p=thirdparty%2Fapache%2Fhttpd.git

approved


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

diff --git a/STATUS b/STATUS
index aec84077834..15e66f5d52b 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * proxy: return consistent error message in case of failure to
+    connect to backend.
+    PR 46971
+    Patch: http://svn.apache.org/viewvc?rev=806920&view=rev
+    +1: niq, covener, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -143,12 +150,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Patch: http://svn.apache.org/viewvc?rev=880794&view=rev
     +1: niq
 
-  * proxy: return consistent error message in case of failure to
-    connect to backend.
-    PR 46971
-    Patch: http://svn.apache.org/viewvc?rev=806920&view=rev
-    +1: niq, covener, jim
-
   * mod_filter: dispatch correctly where dispatch string doesn't exist
     PR 48054
     Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)