root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Undertow 2.2.24.Final 

Closes gh-35504
This commit is contained in:
Andy Wilkinson 2023-05-17 18:43:56 +01:00
parent 93d571b016
commit e1663e2097
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -85,6 +85,7 @@ public class UndertowWebServerFactoryCustomizer
map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders); map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders);
} }
@SuppressWarnings("deprecation")
private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) { private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) {
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
Undertow properties = this.serverProperties.getUndertow(); 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 @Test
@SuppressWarnings("deprecation")
void allowEncodedSlashes() { void allowEncodedSlashes() {
bind("server.undertow.allow-encoded-slash=true"); bind("server.undertow.allow-encoded-slash=true");
assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue(); assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue();

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

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