From 67357a32f45ca25bbf9c40280009778c40fdab66 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 21 Mar 2023 11:59:13 +0000
Subject: [PATCH] Issue #3311406 by Anybody, Grevil, nod_: .htaccess
 ExpiresDefault (2W) is much too low. Should be ~1Y

---
 .htaccess                           | 4 ++--
 core/assets/scaffold/files/htaccess | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.htaccess b/.htaccess
index 6644ce04548f..06e54afbe4be 100644
--- a/.htaccess
+++ b/.htaccess
@@ -35,8 +35,8 @@ AddEncoding gzip svgz
   # Enable expirations.
   ExpiresActive On
 
-  # Cache all files and redirects for 2 weeks after access (A).
-  ExpiresDefault A1209600
+  # Cache all files for 1 year after access.
+  ExpiresDefault "access plus 1 year"
 
   <FilesMatch \.php$>
     # Do not allow PHP scripts to be cached unless they explicitly send cache
diff --git a/core/assets/scaffold/files/htaccess b/core/assets/scaffold/files/htaccess
index 6644ce04548f..06e54afbe4be 100644
--- a/core/assets/scaffold/files/htaccess
+++ b/core/assets/scaffold/files/htaccess
@@ -35,8 +35,8 @@ AddEncoding gzip svgz
   # Enable expirations.
   ExpiresActive On
 
-  # Cache all files and redirects for 2 weeks after access (A).
-  ExpiresDefault A1209600
+  # Cache all files for 1 year after access.
+  ExpiresDefault "access plus 1 year"
 
   <FilesMatch \.php$>
     # Do not allow PHP scripts to be cached unless they explicitly send cache
-- 
GitLab