From: Daniel Earl Poirier <poirier@apache.org>
Date: Fri, 9 Oct 2009 14:32:00 +0000 (+0000)
Subject: Update doc to match change to mod_cache to include s-maxage in
X-Git-Tag: 2.3.3~182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2dad2462cfe84eda8cf6906d76634d5490928f0;p=thirdparty%2Fapache%2Fhttpd.git

Update doc to match change to mod_cache to include s-maxage in
some cacheability decisions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@823563 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/caching.xml b/docs/manual/caching.xml
index 0925734fe38..5c1ac0428d9 100644
--- a/docs/manual/caching.xml
+++ b/docs/manual/caching.xml
@@ -250,12 +250,15 @@
         in the "Cache-Control:" header.</li>
 
         <li>If the URL included a query string (e.g. from a HTML form GET
-        method) it will not be cached unless the response includes an
-        "Expires:" header, as per RFC2616 section 13.9.</li>
+        method) it will not be cached unless the response specifies an
+        explicit expiration by including an "Expires:" header or the max-age
+        or s-maxage directive of the "Cache-Control:" header, as per RFC2616
+        sections 13.9 and 13.2.1.</li>
 
         <li>If the response has a status of 200 (OK), the response must
         also include at least one of the "Etag", "Last-Modified" or
-        the "Expires" headers, unless the 
+        the "Expires" headers, or the max-age or s-maxage directive of
+        the "Cache-Control:" header, unless the 
         <directive module="mod_cache">CacheIgnoreNoLastMod</directive> 
         directive has been used to require otherwise.</li>