Skip to content

Commit 885948c

Browse files
committed
Polish
1 parent f225945 commit 885948c

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class ServerProperties {
8383
private String serverHeader;
8484

8585
/**
86-
* Maximum size, in bytes, of the HTTP message header.
86+
* Maximum size in bytes of the HTTP message header.
8787
*/
8888
private int maxHttpHeaderSize = 0; // bytes
8989

@@ -417,22 +417,22 @@ public static class Tomcat {
417417
private Duration backgroundProcessorDelay = Duration.ofSeconds(10);
418418

419419
/**
420-
* Maximum number of worker threads.
420+
* Maximum amount of worker threads.
421421
*/
422422
private int maxThreads = 200;
423423

424424
/**
425-
* Minimum number of worker threads.
425+
* Minimum amount of worker threads.
426426
*/
427427
private int minSpareThreads = 10;
428428

429429
/**
430-
* Maximum size, in bytes, of the HTTP post content.
430+
* Maximum size in bytes of the HTTP post content.
431431
*/
432432
private int maxHttpPostSize = 2097152;
433433

434434
/**
435-
* Maximum size, in bytes, of the HTTP message header.
435+
* Maximum size in bytes of the HTTP message header.
436436
*/
437437
private int maxHttpHeaderSize = 0;
438438

@@ -795,7 +795,7 @@ public static class Jetty {
795795
private final Accesslog accesslog = new Accesslog();
796796

797797
/**
798-
* Maximum size, in bytes, of the HTTP post or put content.
798+
* Maximum size in bytes of the HTTP post or put content.
799799
*/
800800
private int maxHttpPostSize = 200000; // bytes
801801

@@ -1010,7 +1010,7 @@ public void setLogLatency(boolean logLatency) {
10101010
public static class Undertow {
10111011

10121012
/**
1013-
* Maximum size, in bytes, of the HTTP post content. When the value is -1, the
1013+
* Maximum size in bytes of the HTTP post content. When the value is -1, the
10141014
* default, the size is unlimited.
10151015
*/
10161016
private long maxHttpPostSize = -1; // bytes

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ content into your application. Rather, pick only the properties that you need.
7373
# SPRING CACHE ({sc-spring-boot-autoconfigure}/cache/CacheProperties.{sc-ext}[CacheProperties])
7474
spring.cache.cache-names= # Comma-separated list of cache names to create if supported by the underlying cache manager.
7575
spring.cache.caffeine.spec= # The spec to use to create caches. See CaffeineSpec for more details on the spec format.
76-
spring.cache.couchbase.expiration=0ms # Entry expiration. By default the entries never expire. Note that this value is ultimately converted to seconds.
76+
spring.cache.couchbase.expiration= # Entry expiration. By default the entries never expire. Note that this value is ultimately converted to seconds.
7777
spring.cache.ehcache.config= # The location of the configuration file to use to initialize EhCache.
7878
spring.cache.infinispan.config= # The location of the configuration file to use to initialize Infinispan.
7979
spring.cache.jcache.config= # The location of the configuration file to use to initialize the cache manager.
8080
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.
8181
spring.cache.redis.cache-null-values=true # Allow caching null values.
8282
spring.cache.redis.key-prefix= # Key prefix.
83-
spring.cache.redis.time-to-live=0ms # Entry expiration. By default the entries never expire.
83+
spring.cache.redis.time-to-live= # Entry expiration. By default the entries never expire.
8484
spring.cache.redis.use-key-prefix=true # Whether to use the key prefix when writing to Redis.
8585
spring.cache.type= # Cache type. By default, auto-detected according to the environment.
8686
@@ -235,16 +235,18 @@ content into your application. Rather, pick only the properties that you need.
235235
server.tomcat.accesslog.rotate=true # Whether to enable access log rotation.
236236
server.tomcat.accesslog.suffix=.log # Log file name suffix.
237237
server.tomcat.additional-tld-skip-patterns= # Comma-separated list of additional patterns that match jars to ignore for TLD scanning.
238-
server.tomcat.background-processor-delay=10 # Delay in seconds between the invocation of backgroundProcess methods.
238+
server.tomcat.background-processor-delay=10s # Delay between the invocation of backgroundProcess methods. If a duration suffix is not specified, seconds will be used.
239239
server.tomcat.basedir= # Tomcat base directory. If not specified, a temporary directory is used.
240240
server.tomcat.internal-proxies=10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\
241241
192\\.168\\.\\d{1,3}\\.\\d{1,3}|\\
242242
169\\.254\\.\\d{1,3}\\.\\d{1,3}|\\
243243
127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\
244244
172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\
245245
172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|\\
246-
172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3} # Regular expression matching trusted IP addresses.
247-
server.tomcat.max-connections=10000 # Maximum number of connections that the server will accept and process at any given time.
246+
172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}\\
247+
0:0:0:0:0:0:0:1\\
248+
::1 # Regular expression that matches proxies that are to be trusted.
249+
server.tomcat.max-connections=10000 # Maximum number of connections that the server accepts and processes at any given time
248250
server.tomcat.max-http-header-size=0 # Maximum size in bytes of the HTTP message header.
249251
server.tomcat.max-http-post-size=2097152 # Maximum size in bytes of the HTTP post content.
250252
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.
264266
server.undertow.accesslog.rotate=true # Whether to enable access log rotation.
265267
server.undertow.accesslog.suffix=log # Log file name suffix.
266268
server.undertow.buffer-size= # Size of each buffer, in bytes.
267-
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.
269+
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.
268270
server.undertow.eager-filter-init=true # Whether servlet filters should be initialized on startup.
269271
server.undertow.io-threads= # Number of I/O threads to create for the worker. The default is derived from the number of available processors.
270272
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.

0 commit comments

Comments
 (0)