From: Evgeny Kotkov <kotkov@apache.org>
Date: Mon, 10 Apr 2017 16:08:42 +0000 (+0000)
Subject: mod_brotli: Fix leftovers from mod_deflate or incorrect directives in
X-Git-Tag: 2.5.0-alpha~479
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2afe4d2e2085c198bd1877e0b22eae08019140b;p=thirdparty%2Fapache%2Fhttpd.git

mod_brotli: Fix leftovers from mod_deflate or incorrect directives in
the "Serving pre-compressed content" section of the docs.

Generally speaking, this section would benefit from a rewrite pointing
out how to configure a mod_deflate + mod_brotli configuration with
precompressed contents, but for now at least fix the mistakes in the
configuration.


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

diff --git a/docs/manual/mod/mod_brotli.xml b/docs/manual/mod/mod_brotli.xml
index a44d87b346d..66e9cdfb85a 100644
--- a/docs/manual/mod/mod_brotli.xml
+++ b/docs/manual/mod/mod_brotli.xml
@@ -143,25 +143,25 @@ content</title>
 &lt;IfModule mod_headers.c&gt;
     # Serve brotli compressed CSS files if they exist
     # and the client accepts brotli.
-    RewriteCond "%{HTTP:Accept-encoding}" "brotli"
+    RewriteCond "%{HTTP:Accept-encoding}" "br"
     RewriteCond "%{REQUEST_FILENAME}\.br" "-s"
     RewriteRule "^(.*)\.css"              "$1\.css\.br" [QSA]
 
     # Serve brotli compressed JS files if they exist
     # and the client accepts brotli.
-    RewriteCond "%{HTTP:Accept-encoding}" "brotli"
+    RewriteCond "%{HTTP:Accept-encoding}" "br"
     RewriteCond "%{REQUEST_FILENAME}\.br" "-s"
     RewriteRule "^(.*)\.js"               "$1\.js\.br" [QSA]
 
 
-    # Serve correct content types, and prevent mod_brotli double brotli.
-    RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-brotli:1]
-    RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-brotli:1]
+    # Serve correct content types, and prevent double compression.
+    RewriteRule "\.css\.br$" "-" [T=text/css,E=no-brotli:1]
+    RewriteRule "\.js\.br$"  "-" [T=text/javascript,E=no-brotli:1]
 
 
-    &lt;FilesMatch "(\.js\.gz|\.css\.gz)$"&gt;
+    &lt;FilesMatch "(\.js\.br|\.css\.br)$"&gt;
       # Serve correct encoding type.
-      Header append Content-Encoding brotli
+      Header append Content-Encoding br
 
       # Force proxies to cache brotli &amp;
       # non-brotli css/js files separately.