From: Rainer Jung <rjung@apache.org>
Date: Thu, 17 Dec 2009 11:39:15 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.2.15~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f9ab9417a383a757c6b3ca5daa5b8b53368a99;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index b24def73467..72205d0606a 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,34 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_ldap: Work around broken cache management in mod_ldap:
+    If LDAPSharedCacheSize is too small, try to free some memory by purging
+    the cache and log a warning.
+    Also increase the default LDAPSharedCacheSize to 500000.
+    PR 46749.
+    Trunk Patch: http://svn.apache.org/viewvc?rev=822458&view=rev
+    2.2.x Patch: trunk patch works with some offsets
+    +1: sf, rpluem, rjung
+
+  * mod_mime: Make RemoveType override the info from TypesConfig
+    PR 38330.
+    Trunk Patch: http://svn.apache.org/viewvc?rev=821298&view=rev
+    2.2.x Patch: trunk patch works with some offset (except for CHANGES)
+    +1: sf, rpluem, rjung
+
+  * build: fix --with-module option to work as documented
+    PR 43881
+    Patch: http://svn.apache.org/viewvc?rev=880794&view=rev
+    +1: niq, pgollucci, rjung
+
+  * mod_disk_cache, mod_mem_cache: don't cache incomplete responses,
+    per RFC 2616, 13.8.
+    PR 15866
+    Trunk Patch: http://svn.apache.org/viewvc?rev=818492&view=rev
+                 http://svn.apache.org/viewvc?rev=821763&view=rev
+    2.2.x Patch: http://people.apache.org/~poirier/PR15866-22x.patch
+    +1: poirier, rpluem, rjung
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -125,26 +153,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    +1: minfrin
 
 
-  * mod_ldap: Work around broken cache management in mod_ldap:
-    If LDAPSharedCacheSize is too small, try to free some memory by purging
-    the cache and log a warning.
-    Also increase the default LDAPSharedCacheSize to 500000.
-    PR 46749.
-    Trunk Patch: http://svn.apache.org/viewvc?rev=822458&view=rev
-    2.2.x Patch: trunk patch works with some offsets
-    +1: sf, rpluem, rjung
-
-  * mod_mime: Make RemoveType override the info from TypesConfig
-    PR 38330.
-    Trunk Patch: http://svn.apache.org/viewvc?rev=821298&view=rev
-    2.2.x Patch: trunk patch works with some offset (except for CHANGES)
-    +1: sf, rpluem, rjung
-
-  * build: fix --with-module option to work as documented
-    PR 43881
-    Patch: http://svn.apache.org/viewvc?rev=880794&view=rev
-    +1: niq, pgollucci, rjung
-
   * 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)
@@ -159,14 +167,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: covener, pgollucci
     rpluem says: I am +1 once you provide proper documentation for the manual
 
-  * mod_disk_cache, mod_mem_cache: don't cache incomplete responses,
-    per RFC 2616, 13.8.
-    PR 15866
-    Trunk Patch: http://svn.apache.org/viewvc?rev=818492&view=rev
-                 http://svn.apache.org/viewvc?rev=821763&view=rev
-    2.2.x Patch: http://people.apache.org/~poirier/PR15866-22x.patch
-    +1: poirier, rpluem, rjung
-
   * mod_ssl: Further mitigation for the TLS renegotation attack, CVE-2009-3555
       Trunk version of patch:
          http://svn.apache.org/viewcvs.cgi?rev=891282&view=rev