From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 6 Feb 2020 21:27:30 +0000 (+0000)
Subject: Add compatibility note for "DeflateAlterETag" (already present in 2.4.x)
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6edf41d207cf8cbde1676a696b20eb5f5b0ba141;p=thirdparty%2Fapache%2Fhttpd.git

Add compatibility note for "DeflateAlterETag" (already present in 2.4.x)
Re-order to match 2.4.x order.
Fix a color syntax highlight to synch with 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873722 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml
index 2069a38825d..3955e62a9b5 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
@@ -348,36 +348,6 @@ 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>
-
-<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 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>
-
 <directivesynopsis>
 <name>DeflateInflateLimitRequestBody</name>
 <description>Maximum size of inflated request bodies</description>
@@ -435,4 +405,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.42 and later</compatibility>
+
+<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 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>