Merge branch '4.4'

OskarStark · OskarStark · commit 7b537a0568bc · 2019-08-15T11:17:49.000+02:00
* 4.4: Added needed versionadded directive. refs #12073 [FrameworkBundle][HttpClient] "max_duration" option
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -107,6 +107,7 @@ Configuration
     * `proxy`_
     * `resolve`_
     * `timeout`_
+    * `max_duration`_
     * `verify_host`_
     * `verify_peer`_
 
@@ -134,6 +135,7 @@ Configuration
     * `query`_
     * `resolve`_
     * `timeout`_
+    * `max_duration`_
     * `verify_host`_
     * `verify_peer`_
 
@@ -923,6 +925,18 @@ Time, in seconds, to wait for a response. If the response stales for longer, a
 Its default value is the same as the value of PHP's `default_socket_timeout`_
 config option.
 
+max_duration
+............
+
+**type**: ``float`` **default**: 0
+
+The maximum execution time, in seconds, that the request and the response are
+allowed to take. A value lower than or equal to 0 means it is unlimited.
+
+.. versionadded:: 4.4
+
+    The ``max_duration`` option was introduced in Symfony 4.4.
+
 verify_host
 ...........
 
