Browse Source

Merge branch '2.6.x' into 2.7.x

Closes gh-31914
pull/32861/head
Andy Wilkinson 4 years ago
parent
commit
6d279abe21
  1. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@ -323,6 +323,7 @@ public class ServerProperties { @@ -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() {

Loading…
Cancel
Save