Skip to content

Commit 1dfa5c7

Browse files
committed
Upgrade to Tomcat 11.0.7
Closes gh-45533
1 parent 84578d1 commit 1dfa5c7

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6
2121
snakeYamlVersion=2.4
2222
springFrameworkVersion=7.0.0-SNAPSHOT
2323
springFramework60xVersion=6.0.23
24-
tomcatVersion=11.0.6
24+
tomcatVersion=11.0.7
2525

2626
kotlin.stdlib.default.dependency=false

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java

+10
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,16 @@ public void gc() {
969969
this.delegate.gc();
970970
}
971971

972+
@Override
973+
public void setAllowLinking(boolean allowLinking) {
974+
this.delegate.setAllowLinking(allowLinking);
975+
}
976+
977+
@Override
978+
public boolean getAllowLinking() {
979+
return this.delegate.getAllowLinking();
980+
}
981+
972982
@Override
973983
protected void initInternal() throws LifecycleException {
974984
if (this.delegate instanceof LifecycleBase) {

spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties

+6-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ atomsvc=application/atomsvc+xml
6161
atx=application/vnd.antix.game-component
6262
au=audio/basic
6363
avi=video/x-msvideo
64+
avif=image/avif
6465
avx=video/x-rad-screenplay
6566
aw=application/applixware
6667
axa=audio/annodex
@@ -387,6 +388,7 @@ jsf=text/plain
387388
json=application/json
388389
jsonml=application/jsonml+json
389390
jspf=text/plain
391+
jxl=image/jxl
390392
kar=audio/midi
391393
karbon=application/vnd.kde.karbon
392394
kfo=application/vnd.kde.kformula
@@ -429,6 +431,8 @@ m14=application/x-msmediaview
429431
m1v=video/mpeg
430432
m21=application/mp21
431433
m2a=audio/mpeg
434+
m2t=video/mp2t
435+
m2ts=video/mp2t
432436
m2v=video/mpeg
433437
m3a=audio/mpeg
434438
m3u=audio/x-mpegurl
@@ -521,7 +525,7 @@ msh=model/mesh
521525
msi=application/x-msdownload
522526
msl=application/vnd.mobius.msl
523527
msty=application/vnd.muvee.style
524-
mts=model/vnd.mts
528+
mts=video/mp2t
525529
mus=application/vnd.musician
526530
musicxml=application/vnd.recordare.musicxml+xml
527531
mvb=application/x-msmediaview
@@ -838,6 +842,7 @@ tpt=application/vnd.trid.tpt
838842
tr=text/troff
839843
tra=application/vnd.trueapp
840844
trm=application/x-msterminal
845+
ts=video/mp2t
841846
tsd=application/timestamped-data
842847
tsv=text/tab-separated-values
843848
ttc=font/collection

0 commit comments

Comments
 (0)