Merge branch 'stable-2.13' into stable-2.14
* stable-2.13: Fix formatting of h2 cache documentation Fix formatting of httpd.idleTimeout documentation Change-Id: I320a194f103b045089db5134843c0461b5b464a9
This commit is contained in:
commit
e10c326122
|
@ -604,7 +604,7 @@ caused by the H2 database using too much memory.
|
|||
See <<database.h2.cachesize,database.h2.cachesize>> for a detailed discussion.
|
||||
+
|
||||
Default is unset, using up to half of the available memory.
|
||||
|
||||
+
|
||||
H2 will persist this value in the database, so to unset explicitly specify 0.
|
||||
+
|
||||
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
||||
|
@ -1707,7 +1707,7 @@ the H2 JDBC connection URL, as described
|
|||
link:http://www.h2database.com/html/features.html#cache_settings[here]
|
||||
+
|
||||
Default is unset, using up to half of the available memory.
|
||||
|
||||
+
|
||||
H2 will persist this value in the database, so to unset explicitly specify 0.
|
||||
+
|
||||
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
||||
|
@ -2541,13 +2541,15 @@ org.anyorg.MySecureIPFilter that performs source IP security filtering:
|
|||
Maximum idle time for a connection, which roughly translates to the
|
||||
TCP socket `SO_TIMEOUT`.
|
||||
+
|
||||
The max idle time is applied:
|
||||
* When waiting for a new message to be received on a connection
|
||||
* When waiting for a new message to be sent on a connection
|
||||
+
|
||||
This value is interpreted as the maximum time between some progress
|
||||
being made on the connection. So if a single byte is read or written,
|
||||
then the timeout is reset.
|
||||
+
|
||||
The max idle time is applied:
|
||||
+
|
||||
* When waiting for a new message to be received on a connection
|
||||
* When waiting for a new message to be sent on a connection
|
||||
|
||||
+
|
||||
By default, 30 seconds.
|
||||
|
||||
|
|
Loading…
Reference in New Issue