Merge remote-tracking branch '39484/add-immutable' into julprs

Author: engcom-Charlie

nginx.conf.sample

@@ -24,7 +24,7 @@
 ##
 ## fastcgi_param  MAGE_MODE $MAGE_MODE;
 ##
-## In production mode, you should uncomment the 'expires' directive in the /static/ location block
+## In production mode, you should uncomment the 'add_header Cache-Control "public, max-age=31536000, immutable"' directive in the /static/ location block
 
 # Modules can be loaded only at the very beginning of the Nginx config file, please move the line below to the main config file
 # load_module /etc/nginx/modules/ngx_http_image_filter_module.so;
@@ -110,17 +110,16 @@ location /pub/ {
 
 location /static/ {
     # Uncomment the following line in production mode
-    # expires max;
+    # add_header Cache-Control "public, max-age=31536000, immutable";
 
     # Remove signature of the static files that is used to overcome the browser cache
     location ~ ^/static/version\d*/ {
         rewrite ^/static/version\d*/(.*)$ /static/$1 last;
     }
 
     location ~* \.(ico|jpg|jpeg|png|gif|svg|svgz|webp|avif|avifs|js|css|eot|ttf|otf|woff|woff2|html|json|webmanifest)$ {
-        add_header Cache-Control "public";
+        add_header Cache-Control "public, max-age=31536000, immutable";
         add_header X-Frame-Options "SAMEORIGIN";
-        expires +1y;
 
         if (!-f $request_filename) {
             rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;

pub/static/.htaccess

@@ -75,7 +75,7 @@ AddType application/xml xml
 <IfModule mod_headers.c>
 
     <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|webp|avif|avifs|js|css|eot|ttf|otf|woff|woff2|html|json|webmanifest)$>
-        Header append Cache-Control public
+        Header append Cache-Control "public, max-age=31536000, immutable"
     </FilesMatch>
 
     <FilesMatch .*\.(zip|gz|gzip|bz2|csv|xml)$>