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

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Stephane Nicoll 2023-06-10 10:23:45 +02:00
commit 8589401b65
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.8.22 kotlinVersion=1.8.22
nativeBuildToolsVersion=0.9.22 nativeBuildToolsVersion=0.9.22
springFrameworkVersion=6.0.10-SNAPSHOT springFrameworkVersion=6.0.10-SNAPSHOT
tomcatVersion=10.1.8 tomcatVersion=10.1.9
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false

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

@ -475,6 +475,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(since = "2.7.12", forRemoval = true)
private boolean rejectIllegalHeader = true; private boolean rejectIllegalHeader = true;
/** /**
@ -633,6 +634,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

@ -198,6 +198,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();

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

@ -437,6 +437,7 @@ class TomcatWebServerFactoryCustomizerTests {
} }
@Test @Test
@Deprecated(since = "2.7.12", forRemoval = true)
void testCustomizeRejectIllegalHeader() { void testCustomizeRejectIllegalHeader() {
bind("server.tomcat.reject-illegal-header=false"); bind("server.tomcat.reject-illegal-header=false");
customizeAndRunServer((server) -> assertThat( customizeAndRunServer((server) -> assertThat(