From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 29 Dec 2010 09:05:53 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.18~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de0502488b52ec0911d6d98a4cd4b38bb722fcd;p=thirdparty%2Fapache%2Fhttpd.git

* Promote

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

diff --git a/STATUS b/STATUS
index d9a3a2a79c2..1cf55115fd9 100644
--- a/STATUS
+++ b/STATUS
@@ -104,6 +104,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x: http://people.apache.org/~covener/patches/httpd-2.2.x-memcache_streaming_debug-2.diff
      +1 covener, poirier, rpluem
 
+   * mod_cache: Check the request to determine whether we are allowed
+     to return cached content at all, and respect a "Cache-Control:
+     no-cache" header from a client. Previously, "no-cache" would
+     behave like "max-age=0".
+     PR49200
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=992625
+     2.2.x patch: trunk patch works
+     +1: minfrin, jim
+     +1 covener (needs r996311 MMN bump)
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -153,16 +163,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          See http://marc.info/?l=apache-httpd-dev&m=127970632901262&w=2 and
          the links therein.
 
-   * mod_cache: Check the request to determine whether we are allowed
-     to return cached content at all, and respect a "Cache-Control:
-     no-cache" header from a client. Previously, "no-cache" would
-     behave like "max-age=0".
-     PR49200
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=992625
-     2.2.x patch: trunk patch works
-     +1: minfrin, jim
-     +1 covener (needs r996311 MMN bump)
-
    * mod_proxy: Release the backend connection as soon as EOS is detected,
      so the backend isn't forced to wait for the client to eventually
      acknowledge the data.