diff options
| author | Yury Selivanov <yury@magic.io> | 2018-06-04 15:32:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 15:32:35 (GMT) |
| commit | 9602643120a509858d0bee4215d7f150e6125468 (patch) | |
| tree | 43f875c7a1437f958994c7f2a3c281c45f8e3d5d /Doc/library | |
| parent | a8eb58546b37a7cd5f332f019bb07388f5212c2d (diff) | |
| download | cpython-9602643120a509858d0bee4215d7f150e6125468.zip cpython-9602643120a509858d0bee4215d7f150e6125468.tar.gz cpython-9602643120a509858d0bee4215d7f150e6125468.tar.bz2 | |
bpo-33734: asyncio/ssl: a bunch of bugfixes (#7321)
* Fix AttributeError (not all SSL exceptions have 'errno' attribute)
* Increase default handshake timeout from 10 to 60 seconds
* Make sure start_tls can be cancelled correctly
* Make sure any error in SSLProtocol gets propagated (instead of just being logged)
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/asyncio-eventloop.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index 9d7f236..a38dab0 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -351,7 +351,7 @@ Creating connections * *ssl_handshake_timeout* is (for an SSL connection) the time in seconds to wait for the SSL handshake to complete before aborting the connection. - ``10.0`` seconds if ``None`` (default). + ``60.0`` seconds if ``None`` (default). .. versionadded:: 3.7 @@ -497,7 +497,7 @@ Creating listening connections * *ssl_handshake_timeout* is (for an SSL server) the time in seconds to wait for the SSL handshake to complete before aborting the connection. - ``10.0`` seconds if ``None`` (default). + ``60.0`` seconds if ``None`` (default). * *start_serving* set to ``True`` (the default) causes the created server to start accepting connections immediately. When set to ``False``, @@ -559,7 +559,7 @@ Creating listening connections * *ssl_handshake_timeout* is (for an SSL connection) the time in seconds to wait for the SSL handshake to complete before aborting the connection. - ``10.0`` seconds if ``None`` (default). + ``60.0`` seconds if ``None`` (default). When completed it returns a ``(transport, protocol)`` pair. @@ -628,7 +628,7 @@ TLS Upgrade * *ssl_handshake_timeout* is (for an SSL connection) the time in seconds to wait for the SSL handshake to complete before aborting the connection. - ``10.0`` seconds if ``None`` (default). + ``60.0`` seconds if ``None`` (default). .. versionadded:: 3.7 |