From 83494b22adce3fc719f9924f82120c9fef4b2794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Tue, 13 May 2025 09:28:48 +0200
Subject: [PATCH] Upgrade to Tomcat 10.1.41

Closes gh-45517
---
 gradle.properties                                      |  2 +-
 .../embedded/tomcat/TomcatServletWebServerFactory.java | 10 ++++++++++
 .../boot/web/server/mime-mappings.properties           |  7 ++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 878acf0ae8e..d40d0119d29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6
 snakeYamlVersion=2.3
 springFrameworkVersion=6.2.7-SNAPSHOT
 springFramework60xVersion=6.0.23
-tomcatVersion=10.1.40
+tomcatVersion=10.1.41
 
 kotlin.stdlib.default.dependency=false
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
index 3920748cf3c..3d864181b04 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
@@ -969,6 +969,16 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
 			this.delegate.gc();
 		}
 
+		@Override
+		public void setAllowLinking(boolean allowLinking) {
+			this.delegate.setAllowLinking(allowLinking);
+		}
+
+		@Override
+		public boolean getAllowLinking() {
+			return this.delegate.getAllowLinking();
+		}
+
 		@Override
 		protected void initInternal() throws LifecycleException {
 			if (this.delegate instanceof LifecycleBase) {
diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties
index f74b7c3e160..02d4f465b32 100644
--- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties
+++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties
@@ -61,6 +61,7 @@ atomsvc=application/atomsvc+xml
 atx=application/vnd.antix.game-component
 au=audio/basic
 avi=video/x-msvideo
+avif=image/avif
 avx=video/x-rad-screenplay
 aw=application/applixware
 axa=audio/annodex
@@ -387,6 +388,7 @@ jsf=text/plain
 json=application/json
 jsonml=application/jsonml+json
 jspf=text/plain
+jxl=image/jxl
 kar=audio/midi
 karbon=application/vnd.kde.karbon
 kfo=application/vnd.kde.kformula
@@ -429,6 +431,8 @@ m14=application/x-msmediaview
 m1v=video/mpeg
 m21=application/mp21
 m2a=audio/mpeg
+m2t=video/mp2t
+m2ts=video/mp2t
 m2v=video/mpeg
 m3a=audio/mpeg
 m3u=audio/x-mpegurl
@@ -521,7 +525,7 @@ msh=model/mesh
 msi=application/x-msdownload
 msl=application/vnd.mobius.msl
 msty=application/vnd.muvee.style
-mts=model/vnd.mts
+mts=video/mp2t
 mus=application/vnd.musician
 musicxml=application/vnd.recordare.musicxml+xml
 mvb=application/x-msmediaview
@@ -838,6 +842,7 @@ tpt=application/vnd.trid.tpt
 tr=text/troff
 tra=application/vnd.trueapp
 trm=application/x-msterminal
+ts=video/mp2t
 tsd=application/timestamped-data
 tsv=text/tab-separated-values
 ttc=font/collection