Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt to deprecation of rejectIllegalHeader

Browse Source 
Closes gh-35442
This commit is contained in:
Andy Wilkinson
2023-05-16 19:46:43 +01:00
parent c631f04391
commit f5ff8007be
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,6 +459,7 @@ public class ServerProperties {
/** /**
* Whether to reject requests with illegal header names or values. * Whether to reject requests with illegal header names or values.
*/ */
@Deprecated
private boolean rejectIllegalHeader = true; private boolean rejectIllegalHeader = true;
/** /**
@@ -612,6 +613,7 @@ public class ServerProperties {
this.connectionTimeout = connectionTimeout; this.connectionTimeout = connectionTimeout;
} }
@DeprecatedConfigurationProperty(reason = "The setting has been deprecated in Tomcat")
public boolean isRejectIllegalHeader() { public boolean isRejectIllegalHeader() {
return this.rejectIllegalHeader; return this.rejectIllegalHeader;
} }

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

@@ -220,6 +220,7 @@ public class TomcatWebServerFactoryCustomizer
factory.addConnectorCustomizers((connector) -> connector.setProperty("relaxedQueryChars", relaxedChars)); factory.addConnectorCustomizers((connector) -> connector.setProperty("relaxedQueryChars", relaxedChars));
} }
@SuppressWarnings("deprecation")
private void customizeRejectIllegalHeader(ConfigurableTomcatWebServerFactory factory, boolean rejectIllegalHeader) { private void customizeRejectIllegalHeader(ConfigurableTomcatWebServerFactory factory, boolean rejectIllegalHeader) {
factory.addConnectorCustomizers((connector) -> { factory.addConnectorCustomizers((connector) -> {
ProtocolHandler handler = connector.getProtocolHandler(); ProtocolHandler handler = connector.getProtocolHandler();

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

@@ -365,6 +365,8 @@ class TomcatWebServerFactoryCustomizerTests {
} }
@Test @Test
@Deprecated
@SuppressWarnings("deprecation")
void testCustomizeRejectIllegalHeader() { void testCustomizeRejectIllegalHeader() {
bind("server.tomcat.reject-illegal-header=false"); bind("server.tomcat.reject-illegal-header=false");
customizeAndRunServer((server) -> assertThat( customizeAndRunServer((server) -> assertThat(