From 1f9e96f107a784715d78db73b7dba6ff7f9d57ee Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Wed, 18 Aug 2021 20:29:51 +0200
Subject: [PATCH] Improve Apache gzip & brotli handling

---
 .htaccess        | 29 ------------------------
 assets/.htaccess | 59 +++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/.htaccess b/.htaccess
index 3bb13f726..0e6142e36 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,35 +32,6 @@
 
 	# Google FLoC
 #	Header set Permissions-Policy "interest-cohort=()"
-
-	<FilesMatch "(\.js\.br|\.css\.br)$">
-		SetEnv no-gzip 1
-		SetEnv no-brotli 1
-		# Serve correct encoding type.
-		Header append Content-Encoding br
-		# Force proxies to cache brotli &
-		# non-brotli css/js files separately.
-		Header append Vary Accept-Encoding
-	</FilesMatch>
-
-	<FilesMatch "(\.js\.gz|\.css\.gz)$">
-		SetEnv no-gzip 1
-		SetEnv no-brotli 1
-		# Serve correct encoding type.
-		Header append Content-Encoding gzip
-		# Force proxies to cache gzipped &
-		# non-gzipped css/js files separately.
-		Header append Vary Accept-Encoding
-	</FilesMatch>
-
-	<FilesMatch "(\.js\.br|\.js\.gz)$">
-		Header set Content-Type "application/javascript; charset=utf-8"
-		ForceType application/javascript
-	</FilesMatch>
-	<FilesMatch "(\.css\.br|\.css\.gz)$">
-		Header set Content-Type "text/css; charset=utf-8"
-		ForceType text/css
-	</FilesMatch>
 </IfModule>
 
 #<IfModule mod_brotli.c>
diff --git a/assets/.htaccess b/assets/.htaccess
index 4d77a2ed0..2561259b1 100644
--- a/assets/.htaccess
+++ b/assets/.htaccess
@@ -1,17 +1,50 @@
-<IfModule mod_rewrite.c>
-	RewriteCond %{HTTP:Accept-encoding} br
-	RewriteCond "%{REQUEST_FILENAME}\.br" -s
-	RewriteRule "^(.+\.js)$" "$1\.br" [L,T=application/javascript,QSA]
+<IfModule mod_headers.c>
+	<IfModule mod_rewrite.c>
+		RewriteEngine On
 
-	RewriteCond %{HTTP:Accept-encoding} gzip
-	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-	RewriteRule "^(.+\.js)$" "$1\.gz" [L,T=application/javascript,QSA]
+		RewriteCond %{HTTP:Accept-encoding} br
+		RewriteCond "%{REQUEST_FILENAME}\.br" -s
+		RewriteRule "^(.+\.js)$" "$1\.br" [L,T=application/javascript,QSA]
 
-	RewriteCond %{HTTP:Accept-encoding} br
-	RewriteCond "%{REQUEST_FILENAME}\.br" -s
-	RewriteRule "^(.+\.css)$" "$1\.br" [L,T=text/css,QSA]
+		RewriteCond %{HTTP:Accept-encoding} gzip
+		RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+		RewriteRule "^(.+\.js)$" "$1\.gz" [L,T=application/javascript,QSA]
 
-	RewriteCond %{HTTP:Accept-encoding} gzip
-	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-	RewriteRule "^(.+\.css)$" "$1\.gz" [L,T=text/css,QSA]
+		RewriteCond %{HTTP:Accept-encoding} br
+		RewriteCond "%{REQUEST_FILENAME}\.br" -s
+		RewriteRule "^(.+\.css)$" "$1\.br" [L,T=text/css,QSA]
+
+		RewriteCond %{HTTP:Accept-encoding} gzip
+		RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+		RewriteRule "^(.+\.css)$" "$1\.gz" [L,T=text/css,QSA]
+
+		<FilesMatch "(\.js\.br|\.css\.br)$">
+			SetEnv no-gzip 1
+			SetEnv no-brotli 1
+			# Serve correct encoding type.
+			Header append Content-Encoding br
+			# Force proxies to cache brotli &
+			# non-brotli css/js files separately.
+			Header append Vary Accept-Encoding
+		</FilesMatch>
+
+		<FilesMatch "(\.js\.gz|\.css\.gz)$">
+			SetEnv no-gzip 1
+			SetEnv no-brotli 1
+			# Serve correct encoding type.
+			Header append Content-Encoding gzip
+			# Force proxies to cache gzipped &
+			# non-gzipped css/js files separately.
+			Header append Vary Accept-Encoding
+		</FilesMatch>
+
+		<FilesMatch "(\.js\.br|\.js\.gz)$">
+			Header set Content-Type "application/javascript; charset=utf-8"
+			ForceType application/javascript
+		</FilesMatch>
+		<FilesMatch "(\.css\.br|\.css\.gz)$">
+			Header set Content-Type "text/css; charset=utf-8"
+			ForceType text/css
+		</FilesMatch>
+	</IfModule>
 </IfModule>