Return-Path: 
 <cvs-return-38614-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DA3D4F08
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Tue,  3 May 2011 00:39:41 +0000 (UTC)
Received: (qmail 65849 invoked by uid 500); 3 May 2011 00:39:41 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 65794 invoked by uid 500); 3 May 2011 00:39:41 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 65787 invoked by uid 99); 3 May 2011 00:39:41 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 00:39:41 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2011 00:39:39 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CBDB923889C5; Tue,  3 May 2011 00:39:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110503003918.CBDB923889C5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>