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/events.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/events.py')
| -rw-r--r-- | Lib/asyncio/events.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py index 40946bb..e4e6322 100644 --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -352,8 +352,7 @@ class AbstractEventLoop: ssl_handshake_timeout is the time in seconds that an SSL server will wait for completion of the SSL handshake before aborting the - connection. Default is 10s, longer timeouts may increase vulnerability - to DoS attacks (see https://support.f5.com/csp/article/K13834) + connection. Default is 60s. start_serving set to True (default) causes the created server to start accepting connections immediately. When set to False, @@ -411,7 +410,7 @@ class AbstractEventLoop: accepted connections. ssl_handshake_timeout is the time in seconds that an SSL server - will wait for the SSL handshake to complete (defaults to 10s). + will wait for the SSL handshake to complete (defaults to 60s). start_serving set to True (default) causes the created server to start accepting connections immediately. When set to False, |