From: Eric Covener <covener@apache.org>
Date: Tue, 3 May 2011 00:39:18 +0000 (+0000)
Subject: Merge r1098872 from trunk:
X-Git-Tag: 2.2.18~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e35f08b28d619452ab2590a4d2057c78540ac967;p=thirdparty%2Fapache%2Fhttpd.git

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 debe7be969d..395f234e062 100644
--- 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 7324f3da118..cf2b5968716 100644
--- 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>