From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 6 Sep 2006 17:19:33 +0000 (+0000)
Subject: * Move accepted patches up
X-Git-Tag: 2.2.4~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b8e032fa9aa63bd62a807e0e13162742b0c9cd3;p=thirdparty%2Fapache%2Fhttpd.git

* Move accepted patches up


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

diff --git a/STATUS b/STATUS
index 7b6b79e4dc8..097ccc244dd 100644
--- a/STATUS
+++ b/STATUS
@@ -86,6 +86,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~wrowe/mod_isapi-416293-to-httpd-2.2.patch
       +1 wrowe , fielding, jerenkrantz
 
+    * mod_proxy_balancer: Add in load balancer cluster set capability
+      (with docs)
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&revision=427172
+        http://svn.apache.org/viewvc?view=rev&revision=427368
+        http://svn.apache.org/viewvc?view=rev&revision=428352
+        http://svn.apache.org/viewvc?view=rev&revision=428361
+        http://svn.apache.org/viewvc?view=rev&revision=432352 (partial doc)
+      2.2.x version of patch:
+        http://people.apache.org/~jim/patches/lbset.patch (unified from above)
+      +1: jim, mturk, rpluem
+
+    * mod_ext_filter: Handle filter names which include capital letters.
+      PR 40323.
+      Trunk patch, which applies:
+        http://svn.apache.org/viewvc?view=rev&revision=440028
+      +1: trawick, rpluem, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.
@@ -150,18 +168,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         deflate output filter.
       +1 rpluem
 
-    * mod_proxy_balancer: Add in load balancer cluster set capability
-      (with docs)
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&revision=427172
-        http://svn.apache.org/viewvc?view=rev&revision=427368
-        http://svn.apache.org/viewvc?view=rev&revision=428352
-        http://svn.apache.org/viewvc?view=rev&revision=428361
-        http://svn.apache.org/viewvc?view=rev&revision=432352 (partial doc)
-      2.2.x version of patch:
-        http://people.apache.org/~jim/patches/lbset.patch (unified from above)
-      +1: jim, mturk, rpluem
-
     * mod_proxy: Add in support for ping/pong (heartbeat test) for
       the Proxy. Implement cping/cpong for AJP.
       Trunk version of patch:
@@ -174,12 +180,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           code from http://svn.apache.org/viewvc?view=rev&revision=421686
           (proxy_interpolatem, proxy_vars) which does not belong to the pingpong patch.
 
-    * mod_ext_filter: Handle filter names which include capital letters.
-      PR 40323.
-      Trunk patch, which applies:
-        http://svn.apache.org/viewvc?view=rev&revision=440028
-      +1: trawick, rpluem, jim
-
     * full server version information in the error log at startup as well as server 
       status reports, regardless of ServerTokens
         http://people.apache.org/~trawick/banner-2.2.x-rev2.txt