Skip to content

Commit d823d7b

Browse files
committed
Upgrade to Undertow 2.2.24.Final
Closes gh-34910
1 parent e0d740f commit d823d7b

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.undertow.UndertowOptions;
3232

3333
import org.springframework.boot.context.properties.ConfigurationProperties;
34+
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
3435
import org.springframework.boot.context.properties.NestedConfigurationProperty;
3536
import org.springframework.boot.convert.DurationUnit;
3637
import org.springframework.boot.web.server.Compression;
@@ -1576,10 +1577,13 @@ public void setMaxCookies(Integer maxCookies) {
15761577
this.maxCookies = maxCookies;
15771578
}
15781579

1580+
@Deprecated
1581+
@DeprecatedConfigurationProperty(reason = "This option was interpreted improperly")
15791582
public boolean isAllowEncodedSlash() {
15801583
return this.allowEncodedSlash;
15811584
}
15821585

1586+
@Deprecated
15831587
public void setAllowEncodedSlash(boolean allowEncodedSlash) {
15841588
this.allowEncodedSlash = allowEncodedSlash;
15851589
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public void customize(ConfigurableUndertowWebServerFactory factory) {
8787
map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders);
8888
}
8989

90+
@SuppressWarnings("deprecation")
9091
private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) {
9192
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
9293
Undertow properties = this.serverProperties.getUndertow();

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

+1
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ void customizeWorkerThreads() {
150150
}
151151

152152
@Test
153+
@Deprecated
153154
void allowEncodedSlashes() {
154155
bind("server.undertow.allow-encoded-slash=true");
155156
assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue();

spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1955,7 +1955,7 @@ bom {
19551955
]
19561956
}
19571957
}
1958-
library("Undertow", "2.2.23.Final") {
1958+
library("Undertow", "2.2.24.Final") {
19591959
group("io.undertow") {
19601960
modules = [
19611961
"undertow-core",

0 commit comments

Comments
 (0)