svn commit: r896300 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: core.html.en core.xml

[co...@apache.org]

Author: covener
Date: Wed Jan  6 01:35:09 2010
New Revision: 896300

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

clarify that FileETag is for static files only, and explicitly mention 
that ETags aren't generated for files parsed by mod_include.



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

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en?rev=896300&r1=896299&r2=896300&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.html.en Wed Jan  6 01:35:09 2010
@@ -1170,7 +1170,7 @@
 <div class="directive-section"><h2><a name="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File attributes used to create the ETag
-HTTP response header</td></tr>
+HTTP response header for static files</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FileETag <var>component</var> ...</code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>FileETag INode MTime Size</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
@@ -1181,7 +1181,7 @@
     <p>
     The <code class="directive">FileETag</code> directive configures the file
     attributes that are used to create the <code>ETag</code> (entity
-    tag) response header field when the document is based on a file.
+    tag) response header field when the document is based on a static file.
     (The <code>ETag</code> value is used in cache management to save
     network bandwidth.) In Apache 1.3.22 and earlier, the
     <code>ETag</code> value was <em>always</em> formed
@@ -1225,6 +1225,12 @@
     These conditional requests will break if the <code>ETag</code> format is
     changed via <code class="directive">FileETag</code>.
     </div>
+    <div class="note"><h3>Server Side Includes</h3>
+    An ETag is not generated for responses parsed by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>, 
+    since the response entity can change without a change of the INode, MTime, or Size 
+    of the static file with embedded SSI directives.
+    </div>
+
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=896300&r1=896299&r2=896300&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Wed Jan  6 01:35:09 2010
@@ -1135,7 +1135,7 @@
 <directivesynopsis>
 <name>FileETag</name>
 <description>File attributes used to create the ETag
-HTTP response header</description>
+HTTP response header for static files</description>
 <syntax>FileETag <var>component</var> ...</syntax>
 <default>FileETag INode MTime Size</default>
 <contextlist><context>server config</context><context>virtual host</context>
@@ -1147,7 +1147,7 @@
     <p>
     The <directive>FileETag</directive> directive configures the file
     attributes that are used to create the <code>ETag</code> (entity
-    tag) response header field when the document is based on a file.
+    tag) response header field when the document is based on a static file.
     (The <code>ETag</code> value is used in cache management to save
     network bandwidth.) In Apache 1.3.22 and earlier, the
     <code>ETag</code> value was <em>always</em> formed
@@ -1191,6 +1191,12 @@
     These conditional requests will break if the <code>ETag</code> format is
     changed via <directive>FileETag</directive>.
     </note>
+    <note><title>Server Side Includes</title>
+    An ETag is not generated for responses parsed by <module>mod_include</module>, 
+    since the response entity can change without a change of the INode, MTime, or Size 
+    of the static file with embedded SSI directives.
+    </note>
+
 </usage>
 </directivesynopsis>