From 511b1b69df54a809d7280464a6c688bfc2903e41 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 4 Dec 2019 16:36:43 +0000
Subject: [PATCH] Issue #2960808 by mfb: Disable brotli compression of
pre-compressed CSS and JS
---
.htaccess | 6 +++---
core/assets/scaffold/files/htaccess | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.htaccess b/.htaccess
index 9a73a3d3a36a..ae2e2429087a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -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.
diff --git a/core/assets/scaffold/files/htaccess b/core/assets/scaffold/files/htaccess
index 9a73a3d3a36a..ae2e2429087a 100644
--- a/core/assets/scaffold/files/htaccess
+++ b/core/assets/scaffold/files/htaccess
@@ -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.
--
GitLab