Merge branch '2.6.x' into 2.7.x

Closes gh-31914
spring-projects · Jul 29, 2022 · 6d279ab · 6d279ab
2 parents 5370320 + 2596d61
commit 6d279ab
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/...oconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/...oconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -323,6 +323,7 @@ public static class Session {
 			@DurationUnit(ChronoUnit.SECONDS)
 			private Duration timeout = Duration.ofMinutes(30);
 
+			@NestedConfigurationProperty
 			private final Cookie cookie = new Cookie();
 
 			public Duration getTimeout() {