Merge pull request #37249 from nextcloud/backport/37010/stable25

[stable25] Fix Cache-Control header of non-versioned assets
nextcloud · Mar 16, 2023 · fd7d86a · fd7d86a
2 parents 82443f1 + 9d9c3bf
commit fd7d86a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.htaccess b/.htaccess
@@ -41,11 +41,12 @@
 
   # Add cache control for static resources
   <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)$">
-    Header set Cache-Control "max-age=15778463"
-  </FilesMatch>
-
-  <FilesMatch "\.(css|js|svg|gif|png|jpg|ico|wasm|tflite)(\?v=.*)?$">
-    Header set Cache-Control "max-age=15778463, immutable"
+    <If "%{QUERY_STRING} =~ /(^|&)v=/">
+      Header set Cache-Control "max-age=15778463, immutable"
+    </If>
+    <Else>
+      Header set Cache-Control "max-age=15778463"
+    </Else>
   </FilesMatch>
 
   # Let browsers cache WOFF files for a week