From: Christophe Jaillet <jailletc36@apache.org>
Date: Wed, 23 Aug 2023 21:16:14 +0000 (+0000)
Subject: Add compatibility version, typo (s/hader/header and s/representatins/representations... 
X-Git-Tag: 2.4.58-rc1-candidate~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d8fc897f32dffdd0d93f46124dd2e3995df00c0;p=thirdparty%2Fapache%2Fhttpd.git

Add compatibility version, typo (s/hader/header and s/representatins/representations) and trailing spaces.

Move the new directive at the correct place in the file. [Lucien Gentis]

Mostly r1911874 in trunk.

[skip ci]

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

diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml
index 11141cc7f55..45b0ee25a30 100644
--- a/docs/manual/mod/mod_deflate.xml
+++ b/docs/manual/mod/mod_deflate.xml
@@ -76,7 +76,7 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javasc
 
       <highlight language="config">
 SetOutputFilter DEFLATE
-SetEnvIfNoCase Request_URI "\.(?:gif|jpe?g|png)$" no-gzip 
+SetEnvIfNoCase Request_URI "\.(?:gif|jpe?g|png)$" no-gzip
       </highlight>
 
       <p>If you want to restrict the compression to particular MIME types
@@ -207,36 +207,6 @@ content</title>
     RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
     RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
 
-<directivesynopsis>
-<name>DeflateAlterETag</name>
-<description>How the outgoing ETag header should be modified during compression</description>
-<syntax>DeflateAlterETag AddSuffix|NoChange|Remove</syntax>
-<default>DeflateAlterETag AddSuffix</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
-
-<usage>
-    <p>The <directive>DeflateAlterETag</directive> directive specifies
-    how the ETag hader should be altered when a response is compressed.</p>
-    <dl>
-    <dt>AddSuffix</dt>
-    <dd><p>Append the compression method onto the end of the ETag, causing 
-        compressed and uncompressed representatins to have unique ETags.  
-        This has been the default since 2.4.0, but prevents serving 
-        "HTTP Not Modified" (304) responses to conditional requests for 
-        compressed content.</p></dd>
-    <dt>NoChange</dt>
-    <dd><p>Don't change the ETag on a compressed response. This was the default
-        prior to 2.4.0, but does not satisfy the HTTP/1.1 property that all
-        representations of the same resource have unique ETags </p></dd>
-    <dt>Remove</dt>
-    <dd><p>Remove the ETag header from compressed responses. This prevents 
-        some conditional requests from being possible, but avoids the 
-        shortcomings of the preceding options.  </p></dd>
-    </dl>
-</usage>
-</directivesynopsis>
-
 
     &lt;FilesMatch "(\.js\.gz|\.css\.gz)$"&gt;
       # Serve correct encoding type.
@@ -432,4 +402,35 @@ CustomLog "logs/deflate_log" deflate
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>DeflateAlterETag</name>
+<description>How the outgoing ETag header should be modified during compression</description>
+<syntax>DeflateAlterETag AddSuffix|NoChange|Remove</syntax>
+<default>DeflateAlterETag AddSuffix</default>
+<contextlist><context>server config</context><context>virtual host</context>
+</contextlist>
+<compatibility>Available in Apache 2.4.58 and later</compatibility>
+
+<usage>
+    <p>The <directive>DeflateAlterETag</directive> directive specifies
+    how the ETag header should be altered when a response is compressed.</p>
+    <dl>
+    <dt>AddSuffix</dt>
+    <dd><p>Append the compression method onto the end of the ETag, causing
+        compressed and uncompressed representations to have unique ETags.
+        This has been the default since 2.4.0, but prevents serving
+        "HTTP Not Modified" (304) responses to conditional requests for
+        compressed content.</p></dd>
+    <dt>NoChange</dt>
+    <dd><p>Don't change the ETag on a compressed response. This was the default
+        prior to 2.4.0, but does not satisfy the HTTP/1.1 property that all
+        representations of the same resource have unique ETags.</p></dd>
+    <dt>Remove</dt>
+    <dd><p>Remove the ETag header from compressed responses. This prevents
+        some conditional requests from being possible, but avoids the
+        shortcomings of the preceding options.</p></dd>
+    </dl>
+</usage>
+</directivesynopsis>
+
 </modulesynopsis>