Merge branch '2.6.x' into 2.7.x

Closes gh-31914
2022-07-29 07:06:09 +01:00
parent 53703206ae 2596d616cb
commit 6d279abe21
1 changed files with 1 additions and 0 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -323,6 +323,7 @@ public class ServerProperties {
 			@DurationUnit(ChronoUnit.SECONDS)
 			private Duration timeout = Duration.ofMinutes(30);

+			@NestedConfigurationProperty
 			private final Cookie cookie = new Cookie();

 			public Duration getTimeout() {