From: Cory Benfield Date: Mon, 3 Mar 2014 20:23:59 +0000 (+0000) Subject: Timeout documentation changes. X-Git-Tag: v2.3.0~6^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03f444e601e6608f68f3a09d708af93e4512560a;p=services%2Fpython-requests.git Timeout documentation changes. --- diff --git a/HISTORY.rst b/HISTORY.rst index 9625b95..19c2ff1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -11,6 +11,8 @@ Release History - New ``Response`` property ``is_redirect``, which is true when the library could have processed this response as a redirection (whether or not it actually did). +- The ``timeout`` parameter now affects requests with both ``stream=True`` and + ``stream=False`` equally. 2.2.1 (2014-01-23) ++++++++++++++++++ diff --git a/docs/api.rst b/docs/api.rst index 77f1f02..86061be 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -249,7 +249,9 @@ Behavioral Changes * Timeouts behave slightly differently. On streaming requests, the timeout only applies to the connection attempt. On regular requests, the timeout - is applied to the connection process and downloading the full body. + is applied to the connection process and on to all attempts to read data from + the underlying socket. It does *not* apply to the total download time for the + request. ::