Browse Source

Adapt to deprecation of rejectIllegalHeader

Closes gh-35442
pull/35702/head
Andy Wilkinson 3 years ago
parent
commit
f5ff8007be
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
  2. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
  3. 2
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java

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

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

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

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

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

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

Loading…
Cancel
Save