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

Upgrade to Undertow 2.2.24.Final

Browse Source 
Closes gh-34910
This commit is contained in:
Stephane Nicoll 2023-04-07 15:42:39 +02:00
parent e0d740fe85
commit d823d7b0b1
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import java.util.Map;
import io.undertow.UndertowOptions;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import org.springframework.boot.convert.DurationUnit;
import org.springframework.boot.web.server.Compression;
@ -1576,10 +1577,13 @@ public class ServerProperties {
this.maxCookies = maxCookies;
}
@Deprecated
@DeprecatedConfigurationProperty(reason = "This option was interpreted improperly")
public boolean isAllowEncodedSlash() {
return this.allowEncodedSlash;
}
@Deprecated
public void setAllowEncodedSlash(boolean allowEncodedSlash) {
this.allowEncodedSlash = allowEncodedSlash;
}

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

@ -87,6 +87,7 @@ public class UndertowWebServerFactoryCustomizer
map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders);
}
@SuppressWarnings("deprecation")
private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) {
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
Undertow properties = this.serverProperties.getUndertow();

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

@ -150,6 +150,7 @@ class UndertowWebServerFactoryCustomizerTests {
}
@Test
@Deprecated
void allowEncodedSlashes() {
bind("server.undertow.allow-encoded-slash=true");
assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue();

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1955,7 +1955,7 @@ bom {
]
}
}
library("Undertow", "2.2.23.Final") {
library("Undertow", "2.2.24.Final") {
group("io.undertow") {
modules = [
"undertow-core",