Permalink
Browse files

Timeout documentation changes.

  • Loading branch information...
1 parent d8557a2 commit 03f444e601e6608f68f3a09d708af93e4512560a @Lukasa Lukasa committed Mar 3, 2014
Showing with 5 additions and 1 deletion.
  1. +2 −0 HISTORY.rst
  2. +3 −1 docs/api.rst
View
@@ -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)
++++++++++++++++++
View
@@ -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.
::

0 comments on commit 03f444e

Please sign in to comment.