httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1098875 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: mod_expires.html.en mod_expires.xml
Date Tue, 03 May 2011 00:39:18 GMT
Author: covener
Date: Tue May  3 00:39:18 2011
New Revision: 1098875

URL: http://svn.apache.org/viewvc?rev=1098875&view=rev
Log:
Merge r1098872 from trunk:

mention mod_expires bailing out when the handler has set an Expires header.


Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.html.en?rev=1098875&r1=1098874&r2=1098875&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.html.en Tue May  3 00:39:18 2011
@@ -51,6 +51,10 @@ criteria</td></tr>
     <code>max-age</code> (see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9">RFC
     2616 section 14.9</a>), you can use the <code class="directive"><a href="../mod/mod_headers.html#header">Header</a></code>
directive.</p>
 
+    <p> When the <code>Expires</code> header is already part of the response
+    generated by the server, for example when generated by a CGI script or 
+    proxied from an origin server, this module does not change or add
+    an <code>Expires</code> or <code>Cache-Control</code> header.</p>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.xml?rev=1098875&r1=1098874&r2=1098875&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_expires.xml Tue May  3 00:39:18 2011
@@ -51,6 +51,10 @@ criteria</description>
     2616 section 14.9</a>), you can use the <directive
     module="mod_headers">Header</directive> directive.</p>
 
+    <p> When the <code>Expires</code> header is already part of the response
+    generated by the server, for example when generated by a CGI script or 
+    proxied from an origin server, this module does not change or add
+    an <code>Expires</code> or <code>Cache-Control</code> header.</p>
 </summary>
 
 <section id="AltSyn"><title>Alternate Interval Syntax</title>



Mime
View raw message