Merge r1098872 from trunk:

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

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

diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en
index debe7be969d4637ec342772b26c452ce09aaf135..395f234e0620685c210b97dc2f3e175727221ea6 100644 (file)
--- a/docs/manual/mod/mod_expires.html.en
+++ b/docs/manual/mod/mod_expires.html.en
@@ -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">

diff --git a/docs/manual/mod/mod_expires.xml b/docs/manual/mod/mod_expires.xml
index 7324f3da118c3c7213b918c47c8f66c7ca2f278b..cf2b59687168cccd0e07ca05fd8ebac8fac06ee6 100644 (file)
--- a/docs/manual/mod/mod_expires.xml
+++ b/docs/manual/mod/mod_expires.xml
@@ -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>