From: Philip M. Gollucci <pgollucci@apache.org>
Date: Sun, 21 Feb 2010 01:46:04 +0000 (+0000)
Subject: well that was strange
X-Git-Tag: 2.2.15~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d11a1cd39bbd0f3201f7a8614a7fd42f59af770;p=thirdparty%2Fapache%2Fhttpd.git

well that was strange

revert r912288


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

diff --git a/STATUS b/STATUS
index 9c4c6b6f69e..1ea5b8c15b8 100644
--- a/STATUS
+++ b/STATUS
@@ -125,27 +125,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24976
     +1: minfrin, jim, rpluem
 
- * mod_cache: Introduce the thundering herd lock, a mechanism to keep
-              the flood of requests at bay that strike a backend webserver as
-              a cached entity goes stale.
-   Trunk Patch: http://svn.apache.org/viewvc?rev=808212&view=rev
-                http://svn.apache.org/viewvc?rev=808220&view=rev
-                http://svn.apache.org/viewvc?rev=808649&view=rev
-                http://svn.apache.org/viewvc?rev=808652&view=rev
-                http://svn.apache.org/viewvc?rev=808656&view=rev
-                http://svn.apache.org/viewvc?rev=809440&view=rev
-                http://svn.apache.org/viewvc?rev=809665&view=rev
-   2.2.x Patch: http://people.apache.org/~minfrin/httpd-cache-thundering.patch
-   +1: minfrin, jim, pgollucci
-
-  * core: Make sure to not destroy bucket brigades that have been created
-    by earlier filters. Otherwise the pool cleanups would be removed causing
-    potential memory leaks later on.
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=821477
-    2.2.x patch: http://people.apache.org/~sf/avoid_apr_brigade_destroy-2.2.x.diff
-    +1: sf, rpluem, pgollucci
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -159,6 +138,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    sf:        Couldn't the linux 2.4 bug be worked around by calling access
               twice? Once with R_OK and once with X_OK.
 
+ * mod_cache: Introduce the thundering herd lock, a mechanism to keep
+              the flood of requests at bay that strike a backend webserver as
+              a cached entity goes stale.
+   Trunk Patch: http://svn.apache.org/viewvc?rev=808212&view=rev
+                http://svn.apache.org/viewvc?rev=808220&view=rev
+                http://svn.apache.org/viewvc?rev=808649&view=rev
+                http://svn.apache.org/viewvc?rev=808652&view=rev
+                http://svn.apache.org/viewvc?rev=808656&view=rev
+                http://svn.apache.org/viewvc?rev=809440&view=rev
+                http://svn.apache.org/viewvc?rev=809665&view=rev
+   2.2.x Patch: http://people.apache.org/~minfrin/httpd-cache-thundering.patch
+   +1: minfrin, jim, pgollucci
+
   * mod_reqtimeout: New module to limit time waiting for requests from clients.
     Backport current version from trunk.
     Trunk Patch: http://svn.apache.org/viewvc?rev=821591&view=rev
@@ -207,6 +199,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: trunk patch works
     +1: minfrin
 
+  * core: Make sure to not destroy bucket brigades that have been created
+    by earlier filters. Otherwise the pool cleanups would be removed causing
+    potential memory leaks later on.
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=821477
+    2.2.x patch: http://people.apache.org/~sf/avoid_apr_brigade_destroy-2.2.x.diff
+    +1: sf, rpluem, pgollucci
+
   * mod_proxy_ajp: Really regard the operation a success, when the client
     aborted the connection. In addition adjust the log message if the client
     aborted the connection.