From 885948ce3b3ee8d41785ebb773596cb035c60ce2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 23 Sep 2018 10:47:09 +0200 Subject: [PATCH] Polish --- .../boot/autoconfigure/web/ServerProperties.java | 14 +++++++------- .../asciidoc/appendix-application-properties.adoc | 14 ++++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git 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 index 6d7e7ac0be..64c61bdb3c 100644 --- 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 @@ -83,7 +83,7 @@ public class ServerProperties { private String serverHeader; /** - * Maximum size, in bytes, of the HTTP message header. + * Maximum size in bytes of the HTTP message header. */ private int maxHttpHeaderSize = 0; // bytes @@ -417,22 +417,22 @@ public class ServerProperties { private Duration backgroundProcessorDelay = Duration.ofSeconds(10); /** - * Maximum number of worker threads. + * Maximum amount of worker threads. */ private int maxThreads = 200; /** - * Minimum number of worker threads. + * Minimum amount of worker threads. */ private int minSpareThreads = 10; /** - * Maximum size, in bytes, of the HTTP post content. + * Maximum size in bytes of the HTTP post content. */ private int maxHttpPostSize = 2097152; /** - * Maximum size, in bytes, of the HTTP message header. + * Maximum size in bytes of the HTTP message header. */ private int maxHttpHeaderSize = 0; @@ -795,7 +795,7 @@ public class ServerProperties { private final Accesslog accesslog = new Accesslog(); /** - * Maximum size, in bytes, of the HTTP post or put content. + * Maximum size in bytes of the HTTP post or put content. */ private int maxHttpPostSize = 200000; // bytes @@ -1010,7 +1010,7 @@ public class ServerProperties { public static class Undertow { /** - * Maximum size, in bytes, of the HTTP post content. When the value is -1, the + * Maximum size in bytes of the HTTP post content. When the value is -1, the * default, the size is unlimited. */ private long maxHttpPostSize = -1; // bytes diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 69809f36c3..3c0c419fe2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -73,14 +73,14 @@ content into your application. Rather, pick only the properties that you need. # SPRING CACHE ({sc-spring-boot-autoconfigure}/cache/CacheProperties.{sc-ext}[CacheProperties]) spring.cache.cache-names= # Comma-separated list of cache names to create if supported by the underlying cache manager. spring.cache.caffeine.spec= # The spec to use to create caches. See CaffeineSpec for more details on the spec format. - spring.cache.couchbase.expiration=0ms # Entry expiration. By default the entries never expire. Note that this value is ultimately converted to seconds. + spring.cache.couchbase.expiration= # Entry expiration. By default the entries never expire. Note that this value is ultimately converted to seconds. spring.cache.ehcache.config= # The location of the configuration file to use to initialize EhCache. spring.cache.infinispan.config= # The location of the configuration file to use to initialize Infinispan. spring.cache.jcache.config= # The location of the configuration file to use to initialize the cache manager. spring.cache.jcache.provider= # Fully qualified name of the CachingProvider implementation to use to retrieve the JSR-107 compliant cache manager. Needed only if more than one JSR-107 implementation is available on the classpath. spring.cache.redis.cache-null-values=true # Allow caching null values. spring.cache.redis.key-prefix= # Key prefix. - spring.cache.redis.time-to-live=0ms # Entry expiration. By default the entries never expire. + spring.cache.redis.time-to-live= # Entry expiration. By default the entries never expire. spring.cache.redis.use-key-prefix=true # Whether to use the key prefix when writing to Redis. spring.cache.type= # Cache type. By default, auto-detected according to the environment. @@ -235,7 +235,7 @@ content into your application. Rather, pick only the properties that you need. server.tomcat.accesslog.rotate=true # Whether to enable access log rotation. server.tomcat.accesslog.suffix=.log # Log file name suffix. server.tomcat.additional-tld-skip-patterns= # Comma-separated list of additional patterns that match jars to ignore for TLD scanning. - server.tomcat.background-processor-delay=10 # Delay in seconds between the invocation of backgroundProcess methods. + server.tomcat.background-processor-delay=10s # Delay between the invocation of backgroundProcess methods. If a duration suffix is not specified, seconds will be used. server.tomcat.basedir= # Tomcat base directory. If not specified, a temporary directory is used. server.tomcat.internal-proxies=10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\ 192\\.168\\.\\d{1,3}\\.\\d{1,3}|\\ @@ -243,8 +243,10 @@ content into your application. Rather, pick only the properties that you need. 127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\ 172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\ 172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\ - 172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3} # Regular expression matching trusted IP addresses. - server.tomcat.max-connections=10000 # Maximum number of connections that the server will accept and process at any given time. + 172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}\\ + 0:0:0:0:0:0:0:1\\ + ::1 # Regular expression that matches proxies that are to be trusted. + server.tomcat.max-connections=10000 # Maximum number of connections that the server accepts and processes at any given time server.tomcat.max-http-header-size=0 # Maximum size in bytes of the HTTP message header. server.tomcat.max-http-post-size=2097152 # Maximum size in bytes of the HTTP post content. server.tomcat.max-threads=200 # Maximum amount of worker threads. @@ -264,7 +266,7 @@ content into your application. Rather, pick only the properties that you need. server.undertow.accesslog.rotate=true # Whether to enable access log rotation. server.undertow.accesslog.suffix=log # Log file name suffix. server.undertow.buffer-size= # Size of each buffer, in bytes. - server.undertow.direct-buffers= # Allocate buffers outside the Java heap. The default is derived from the maximum amount of memory that is available to the JVM. + server.undertow.direct-buffers= # Whether to allocate buffers outside the Java heap. The default is derived from the maximum amount of memory that is available to the JVM. server.undertow.eager-filter-init=true # Whether servlet filters should be initialized on startup. server.undertow.io-threads= # Number of I/O threads to create for the worker. The default is derived from the number of available processors. server.undertow.max-http-post-size=-1 # Maximum size in bytes of the HTTP post content. When the value is -1, the default, the size is unlimited.