Merge branch '2.1.x' into 2.2.x

Closes gh-19091
This commit is contained in:
Stephane Nicoll
2019-11-21 14:38:09 +01:00

View File

@@ -220,8 +220,7 @@ public class WebMvcProperties {
/**
* Amount of time before asynchronous request handling times out. If this value is
* not set, the default timeout of the underlying implementation is used, e.g. 10
* seconds on Tomcat with Servlet 3.
* not set, the default timeout of the underlying implementation is used.
*/
private Duration requestTimeout;