Unverified Commit cc43ae66 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2960808 by mfb: Disable brotli compression of pre-compressed CSS and JS 

(cherry picked from commit 511b1b69)
parent f7b23810

.htaccess

+3 −3
Original line number Diff line number Diff line
@@ -167,9 +167,9 @@ AddEncoding gzip svgz 
    RewriteCond %{REQUEST_FILENAME}\.gz -s

    RewriteRule ^(.*)\.js $1\.js\.gz [QSA]



    # Serve correct content types, and prevent mod_deflate double gzip.

    RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1]

    RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1]

    # Serve correct content types, and prevent double compression.

    RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]

    RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1,E=no-brotli:1]



    <FilesMatch "(\.js\.gz|\.css\.gz)$">

      # Serve correct encoding type.

core/assets/scaffold/files/htaccess

+3 −3
Original line number Diff line number Diff line
@@ -167,9 +167,9 @@ AddEncoding gzip svgz 
    RewriteCond %{REQUEST_FILENAME}\.gz -s

    RewriteRule ^(.*)\.js $1\.js\.gz [QSA]



    # Serve correct content types, and prevent mod_deflate double gzip.

    RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1]

    RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1]

    # Serve correct content types, and prevent double compression.

    RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]

    RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1,E=no-brotli:1]



    <FilesMatch "(\.js\.gz|\.css\.gz)$">

      # Serve correct encoding type.