Commit 20ed4bf7 authored by Eric Covener's avatar Eric Covener
Browse files

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
parent 66c97164

docs/manual/mod/mod_expires.html.en

+4 −0
Original line number Diff line number Diff line
@@ -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">

docs/manual/mod/mod_expires.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>