Merge branch '2.7.x'

Closes gh-31915
This commit is contained in:
Andy Wilkinson 2022-07-29 07:06:30 +01:00
commit 44beb11d38

View File

@ -327,6 +327,7 @@ public class ServerProperties {
@DurationUnit(ChronoUnit.SECONDS)
private Duration timeout = Duration.ofMinutes(30);
@NestedConfigurationProperty
private final Cookie cookie = new Cookie();
public Duration getTimeout() {