Skip to content

Commit f5ff800

Browse files
committed
Adapt to deprecation of rejectIllegalHeader
Closes gh-35442
1 parent c631f04 commit f5ff800

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

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
@@ -459,6 +459,7 @@ public static class Tomcat {
459459
/**
460460
* Whether to reject requests with illegal header names or values.
461461
*/
462+
@Deprecated
462463
private boolean rejectIllegalHeader = true;
463464

464465
/**
@@ -612,6 +613,7 @@ public void setConnectionTimeout(Duration connectionTimeout) {
612613
this.connectionTimeout = connectionTimeout;
613614
}
614615

616+
@DeprecatedConfigurationProperty(reason = "The setting has been deprecated in Tomcat")
615617
public boolean isRejectIllegalHeader() {
616618
return this.rejectIllegalHeader;
617619
}

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
@@ -220,6 +220,7 @@ private void customizeRelaxedQueryChars(ConfigurableTomcatWebServerFactory facto
220220
factory.addConnectorCustomizers((connector) -> connector.setProperty("relaxedQueryChars", relaxedChars));
221221
}
222222

223+
@SuppressWarnings("deprecation")
223224
private void customizeRejectIllegalHeader(ConfigurableTomcatWebServerFactory factory, boolean rejectIllegalHeader) {
224225
factory.addConnectorCustomizers((connector) -> {
225226
ProtocolHandler handler = connector.getProtocolHandler();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,8 @@ void disableRemoteIpValve() {
365365
}
366366

367367
@Test
368+
@Deprecated
369+
@SuppressWarnings("deprecation")
368370
void testCustomizeRejectIllegalHeader() {
369371
bind("server.tomcat.reject-illegal-header=false");
370372
customizeAndRunServer((server) -> assertThat(

0 commit comments

Comments
 (0)