From: Jim Jagielski <jim@apache.org>
Date: Tue, 17 Jul 2007 17:21:55 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.5~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e9d627ab7a4cfce7b8b1afdb34835639e7ed96;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 972350355d8..56cdbe212c1 100644
--- a/STATUS
+++ b/STATUS
@@ -77,6 +77,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_proxy: Add in ProxyPassMatch directive, that allows
+     ProxyPass to take a regex.
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&revision=537429
+        http://svn.apache.org/viewvc?view=rev&revision=537599
+      2.2.x version of patch:
+        http://people.apache.org/~jim/patches/ppmatch.txt
+      +1: jim, jfclere, mturk
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     
@@ -229,15 +237,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~chrisd/patches/mod_dbd_pools_groups/mod_dbd-4groups-2.2.x.patch
      +1: chrisd
 
-    * mod_proxy: Add in ProxyPassMatch directive, that allows
-     ProxyPass to take a regex.
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&revision=537429
-        http://svn.apache.org/viewvc?view=rev&revision=537599
-      2.2.x version of patch:
-        http://people.apache.org/~jim/patches/ppmatch.txt
-      +1: jim, jfclere, mturk
-
     * mod_proxy: Improve traces in ap_proxy_http_process_response()
       to investigate PR37770.
       Trunk version of patch: