Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Tomcat 10.1.8

Browse Source 
Closes gh-35095
This commit is contained in:
Andy Wilkinson 2023-04-20 09:59:09 +01:00
parent dbab743018
commit 26c98eded9
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -5,7 +5,7 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.8.20
tomcatVersion=10.1.7
tomcatVersion=10.1.8
nativeBuildToolsVersion=0.9.21
kotlin.stdlib.default.dependency=false

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
View File

@ -259,7 +259,7 @@ public sealed class MimeMappings implements Iterable<MimeMappings.Mapping> {
mappings.add("jpe", "image/jpeg");
mappings.add("jpeg", "image/jpeg");
mappings.add("jpg", "image/jpeg");
mappings.add("js", "application/javascript");
mappings.add("js", "text/javascript");
mappings.add("json", "application/json");
mappings.add("otf", "font/otf");
mappings.add("pdf", "application/pdf");

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

@ -381,7 +381,7 @@ jpg=image/jpeg
jpgm=video/jpm
jpgv=video/jpeg
jpm=video/jpm
js=application/javascript
js=text/javascript
jsf=text/plain
json=application/json
jsonml=application/jsonml+json

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java
View File

@ -221,7 +221,7 @@ class MimeMappingsTests {
.loadProperties(new ClassPathResource("mime-mappings.properties", getClass()));
Properties tomcatDefaultMimeMappings = PropertiesLoaderUtils
.loadProperties(new ClassPathResource("MimeTypeMappings.properties", Tomcat.class));
assertThat(ourDefaultMimeMappings).isEqualTo(tomcatDefaultMimeMappings);
assertThat(ourDefaultMimeMappings).containsExactlyInAnyOrderEntriesOf(tomcatDefaultMimeMappings);
}
@Test