From daf0ad00b0ee743c58f6b0023c00c4675dba109d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20M=C3=BCller?= <typo3@krue.ml> Date: Thu, 16 Jun 2022 16:30:07 +0200 Subject: [PATCH] [TASK] Add image formats avif/avifs to htaccess Additionally, use "On" as value for ExpiresActive directive as this is the preferred notation. Resolves: #97764 Releases: main, 11.5 Change-Id: Iee2433cf88cc7b7200a72c7d5308da0202fe3e78 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74933 Tested-by: core-ci <typo3@b13.com> Tested-by: Benni Mack <benni@typo3.org> Reviewed-by: Benni Mack <benni@typo3.org> --- .../Private/FolderStructureTemplateFiles/root-htaccess | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess index 8d8bd60fb87c..c83fd8c8b864 100644 --- a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess +++ b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess @@ -111,7 +111,7 @@ # This affects Frontend and Backend and increases performance. <IfModule mod_expires.c> - ExpiresActive on + ExpiresActive On ExpiresDefault "access plus 1 month" ExpiresByType text/css "access plus 1 year" @@ -259,7 +259,7 @@ AddDefaultCharset utf-8 # Send the CORS header for images when browsers request it. <IfModule mod_setenvif.c> <IfModule mod_headers.c> - <FilesMatch "\.(bmp|cur|gif|ico|jpe?g|png|svgz?|webp)$"> + <FilesMatch "\.(avifs?|bmp|cur|gif|ico|jpe?g|png|svgz?|webp)$"> SetEnvIf Origin ":" IS_CORS Header set Access-Control-Allow-Origin "*" env=IS_CORS </FilesMatch> @@ -377,7 +377,7 @@ Options -MultiViews <IfModule mod_headers.c> # Force IE to render pages in the highest available mode Header set X-UA-Compatible "IE=edge" - <FilesMatch "\.(appcache|crx|css|eot|gif|htc|ico|jpe?g|js|m4a|m4v|manifest|mp4|oex|oga|ogg|ogv|otf|pdf|png|safariextz|svgz?|ttf|vcf|webapp|webm|webp|woff2?|xml|xpi)$"> + <FilesMatch "\.(appcache|avifs?|crx|css|eot|gif|htc|ico|jpe?g|js|m4a|m4v|manifest|mp4|oex|oga|ogg|ogv|otf|pdf|png|safariextz|svgz?|ttf|vcf|webapp|webm|webp|woff2?|xml|xpi)$"> Header unset X-UA-Compatible </FilesMatch> -- GitLab