root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to Tomcat 10.1.41
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 

Closes gh-45514
This commit is contained in:
Stéphane Nicoll 2025-05-13 09:07:08 +02:00
parent 1662f051d4
commit 09c79cce85
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6
snakeYamlVersion=2.2
springFrameworkVersion=6.1.20-SNAPSHOT
springFramework60xVersion=6.0.23
tomcatVersion=10.1.40
tomcatVersion=10.1.41
kotlin.stdlib.default.dependency=false

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

@ -963,6 +963,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) {

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

@ -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