diff --git a/AUTHORS.rst b/AUTHORS.rst index b0ddcabb..0654190b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -167,3 +167,4 @@ Patches and Suggestions - piotrjurkiewicz - Jesse Shapiro (`@haikuginger `_) - Nate Prewitt (`@nateprewitt `_) +- Maik Himstedt diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst index d6d04569..343ba0ec 100644 --- a/docs/user/advanced.rst +++ b/docs/user/advanced.rst @@ -910,7 +910,8 @@ Timeouts -------- Most requests to external servers should have a timeout attached, in case the -server is not responding in a timely manner. Without a timeout, your code may +server is not responding in a timely manner. By default, requests do not time +out unless a timeout value is set explicitly. Without a timeout, your code may hang for minutes or more. The **connect** timeout is the number of seconds Requests will wait for your diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst index 0d725389..c4b739ab 100644 --- a/docs/user/quickstart.rst +++ b/docs/user/quickstart.rst @@ -497,7 +497,8 @@ seconds with the ``timeout`` parameter:: ``timeout`` is not a time limit on the entire response download; rather, an exception is raised if the server has not issued a response for ``timeout`` seconds (more precisely, if no bytes have been - received on the underlying socket for ``timeout`` seconds). + received on the underlying socket for ``timeout`` seconds). If no timeout is specified explicitly, requests do + not time out. Errors and Exceptions