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 /Lib/asyncio/constants.py | |
| 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 'Lib/asyncio/constants.py')
| -rw-r--r-- | Lib/asyncio/constants.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/constants.py b/Lib/asyncio/constants.py index d7ba496..33feed6 100644 --- a/Lib/asyncio/constants.py +++ b/Lib/asyncio/constants.py @@ -12,7 +12,8 @@ ACCEPT_RETRY_DELAY = 1 DEBUG_STACK_DEPTH = 10 # Number of seconds to wait for SSL handshake to complete -SSL_HANDSHAKE_TIMEOUT = 10.0 +# The default timeout matches that of Nginx. +SSL_HANDSHAKE_TIMEOUT = 60.0 # Used in sendfile fallback code. We use fallback for platforms # that don't support sendfile, or for TLS connections. |