Merge branch '2.6.x' into 2.7.x

Closes gh-31914
This commit is contained in:
Andy Wilkinson 2022-07-29 07:06:09 +01:00
commit 6d279abe21

View File

@ -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() {