From 882b5129b9f8d476c49cccc2a6df9866c7f2c732 Mon Sep 17 00:00:00 2001
From: Jay Trees <github.hybridsupply@grandel.anonaddy.me>
Date: Mon, 7 Mar 2022 16:09:44 +0100
Subject: [PATCH] Improve caching

---
 .htaccess | 61 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index fda503d4..bed7f119 100644
--- a/.htaccess
+++ b/.htaccess
@@ -17,12 +17,61 @@
   RewriteRule ^([a-z\-]+)$ /?page=$1 [QSA,L]
 </IfModule>
 
-#
-# Headers
-#
+##-- When caching of gzipped JS and CSS files is used, enable this setting
 <IfModule mod_headers.c>
-  # 1 Year
-  <FilesMatch "\.(woff2|js|css|png|svg|jpg)$">
-    Header set Cache-Control "public, max-age=31536000, no-transform"
+  Header set Vary Accept-Encoding
+</IfModule>
+
+##-- Enable the compression for any type of content
+<IfModule mod_deflate.c>
+  <FilesMatch "(\.js|\.css|\.html|\.htm|\.php|\.xml|\.ico|\.jpg|\.jpeg|\.png|\.gif|\.svg|\.woff|\.woff2|\.ttf|\.otf|\.eot|\.JS|\.CSS|\.HTML|\.HTM|\.PHP|\.XML|\.ICO|\.JPG|\.JPEG|\.PNG|\.GIF|\.SVG|\.WOFF|\.WOFF2|\.TTF|\.OTF|\.EOT)$">
+    SetOutputFilter DEFLATE
   </FilesMatch>
 </IfModule>
+
+##-- Customization of HTTP request and response headers
+<IfModule mod_headers.c>
+  <FilesMatch "(\.ico|\.jpg|\.jpeg|\.png|\.gif|\.swf|\.flv|\.svg|\.ICO|\.JPG|\.JPEG|\.PNG|\.GIF|\.SWF|\.FLV|\.SVG)$">
+    Header set Cache-Control "max-age=2592000, public, must-revalidate"
+  </FilesMatch>
+  <FilesMatch "(\.woff|\.woff2|\.ttf|\.otf|\.eot|\.WOFF|\.WOFF2|\.TTF|\.OTF|\.EOT)$">
+    Header set Cache-Control "max-age=2592000, public, must-revalidate"
+  </FilesMatch>
+  <FilesMatch "(\.css|\.js|\.CSS|\.JS)$">
+    Header set Cache-Control "max-age=604800, private, must-revalidate"
+  </FilesMatch>
+  <FilesMatch "(\.xml|\.txt|\.XML|\.TXT)$">
+    Header set Cache-Control "max-age=604800, public, must-revalidate"
+  </FilesMatch>
+  <FilesMatch "(\.html|\.htm|\.php|\.HTML|\.HTM|\.PHP)$">
+    Header set Cache-Control "max-age=1, private, must-revalidate"
+  </FilesMatch>
+</IfModule>
+
+##-- Generation of Expires and Cache-Control HTTP headers
+<IfModule mod_expires.c>
+  ExpiresActive On
+  ExpiresDefault "access plus 1 seconds"
+  ExpiresByType image/gif "access plus 2592000 seconds"
+  ExpiresByType image/jpg "access plus 2592000 seconds"
+  ExpiresByType image/jpeg "access plus 2592000 seconds"
+  ExpiresByType image/png "access plus 2592000 seconds"
+  ExpiresByType image/svg+xml "access plus 2592000 seconds"
+  ExpiresByType text/html "access plus 1 seconds"
+  ExpiresByType text/css "access plus 604800 seconds"
+  ExpiresByType text/javascript "access plus 604800 seconds"
+  ExpiresByType application/x-javascript "access plus 604800 seconds"
+  ExpiresByType application/javascript "access plus 604800 seconds"
+  ExpiresByType text/x-component "access plus 604800 seconds"
+  ExpiresByType font/truetype "access plus 604800 seconds"
+  ExpiresByType font/opentype "access plus 604800 seconds"
+  ExpiresByType application/x-font-ttf "access plus 604800 seconds"
+  ExpiresByType application/x-font-woff "access plus 604800 seconds"
+  ExpiresByType application/font-woff "access plus 604800 seconds"
+  ExpiresByType application/vnd.ms-fontobject "access plus 604800 seconds"
+  ExpiresByType image/x-icon "access plus 604800 seconds"
+
+  <IfModule mod_headers.c>
+    Header append Cache-Control "public"
+  </IfModule>
+</IfModule>