Skip to content

Commit 27ee605

Browse files
committed
Upgrade to Tomcat 10.1.9
Closes gh-35819
1 parent 767ec4e commit 27ee605

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
77
kotlinVersion=1.8.22
88
nativeBuildToolsVersion=0.9.22
99
springFrameworkVersion=6.0.10-SNAPSHOT
10-
tomcatVersion=10.1.8
10+
tomcatVersion=10.1.9
1111

1212
kotlin.stdlib.default.dependency=false

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ public static class Tomcat {
475475
/**
476476
* Whether to reject requests with illegal header names or values.
477477
*/
478+
@Deprecated(since = "2.7.12", forRemoval = true)
478479
private boolean rejectIllegalHeader = true;
479480

480481
/**
@@ -633,6 +634,7 @@ public void setConnectionTimeout(Duration connectionTimeout) {
633634
this.connectionTimeout = connectionTimeout;
634635
}
635636

637+
@DeprecatedConfigurationProperty(reason = "The setting has been deprecated in Tomcat")
636638
public boolean isRejectIllegalHeader() {
637639
return this.rejectIllegalHeader;
638640
}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ private void customizeRelaxedQueryChars(ConfigurableTomcatWebServerFactory facto
198198
factory.addConnectorCustomizers((connector) -> connector.setProperty("relaxedQueryChars", relaxedChars));
199199
}
200200

201+
@SuppressWarnings("deprecation")
201202
private void customizeRejectIllegalHeader(ConfigurableTomcatWebServerFactory factory, boolean rejectIllegalHeader) {
202203
factory.addConnectorCustomizers((connector) -> {
203204
ProtocolHandler handler = connector.getProtocolHandler();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ void disableRemoteIpValve() {
437437
}
438438

439439
@Test
440+
@Deprecated(since = "2.7.12", forRemoval = true)
440441
void testCustomizeRejectIllegalHeader() {
441442
bind("server.tomcat.reject-illegal-header=false");
442443
customizeAndRunServer((server) -> assertThat(

0 commit comments

Comments
 (0)