From ad6da37430364b588e216ebd72f139e0df4fde45 Mon Sep 17 00:00:00 2001
From: Marco Ziesing <noreply@example.com>
Date: Mon, 22 Nov 2021 17:19:34 +0000
Subject: [PATCH] [BUGFIX] Update mime types, caching and compression in
 htaccess
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add MIME types avif(s) and jxl. Update caching and
compression of current and new MIME types.

Releases: master, 11.5
Resolves: #96051
Change-Id: I8c0cfffe82e17ea4ae2a15981e08016a3b0a4fec
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72251
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Guido Schmechel <guido.schmechel@brandung.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 .../FolderStructureTemplateFiles/root-htaccess    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess
index 530953053576..8d8bd60fb87c 100644
--- a/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess
+++ b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess
@@ -69,6 +69,7 @@
 			application/rss+xml \
 			application/schema+json \
 			application/vnd.geo+json \
+			application/geo+json \
 			application/vnd.ms-fontobject \
 			application/x-font-ttf \
 			application/x-javascript \
@@ -77,6 +78,8 @@
 			application/xml \
 			font/eot \
 			font/opentype \
+			font/otf \
+			font/ttf \
 			image/bmp \
 			image/svg+xml \
 			image/vnd.microsoft.icon \
@@ -117,6 +120,7 @@
 	ExpiresByType application/ld+json                   "access plus 0 seconds"
 	ExpiresByType application/schema+json               "access plus 0 seconds"
 	ExpiresByType application/vnd.geo+json              "access plus 0 seconds"
+	ExpiresByType application/geo+json                  "access plus 0 seconds"
 	ExpiresByType application/xml                       "access plus 0 seconds"
 	ExpiresByType text/xml                              "access plus 0 seconds"
 
@@ -136,9 +140,13 @@
 	ExpiresByType text/cache-manifest                   "access plus 0 seconds"
 
 	ExpiresByType audio/ogg                             "access plus 1 month"
+	ExpiresByType image/apng                            "access plus 1 month"
+	ExpiresByType image/avif                            "access plus 1 month"
+	ExpiresByType image/avif-sequence                   "access plus 1 month"
 	ExpiresByType image/bmp                             "access plus 1 month"
 	ExpiresByType image/gif                             "access plus 1 month"
 	ExpiresByType image/jpeg                            "access plus 1 month"
+	ExpiresByType image/jxl                             "access plus 1 month"
 	ExpiresByType image/png                             "access plus 1 month"
 	ExpiresByType image/svg+xml                         "access plus 1 month"
 	ExpiresByType image/webp                            "access plus 1 month"
@@ -150,14 +158,18 @@
 	ExpiresByType application/rdf+xml                   "access plus 1 hour"
 	ExpiresByType application/rss+xml                   "access plus 1 hour"
 
+	ExpiresByType font/collection                       "access plus 1 month"
 	ExpiresByType application/vnd.ms-fontobject         "access plus 1 month"
 	ExpiresByType font/eot                              "access plus 1 month"
 	ExpiresByType font/opentype                         "access plus 1 month"
+	ExpiresByType font/otf                              "access plus 1 month"
 	ExpiresByType application/x-font-ttf                "access plus 1 month"
+	ExpiresByType font/ttf                              "access plus 1 month"
 	ExpiresByType application/font-woff                 "access plus 1 month"
 	ExpiresByType application/x-font-woff               "access plus 1 month"
 	ExpiresByType font/woff                             "access plus 1 month"
 	ExpiresByType application/font-woff2                "access plus 1 month"
+	ExpiresByType font/woff2                            "access plus 1 month"
 
 	ExpiresByType text/x-cross-domain-policy            "access plus 1 week"
 
@@ -201,7 +213,10 @@
 
 	AddType audio/mp4                                   f4a f4b m4a
 	AddType audio/ogg                                   oga ogg opus
+	AddType image/avif                                  avif
+	AddType image/avif-sequence                         avifs
 	AddType image/bmp                                   bmp
+	AddType image/jxl                                   jxl
 	AddType image/webp                                  webp
 	AddType video/mp4                                   f4v f4p m4v mp4
 	AddType video/ogg                                   ogv
-- 
GitLab