summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-14 17:12:59 +0100
committerVictor Stinner <victor.stinner@gmail.com>2015-01-14 17:12:59 +0100
commit0acde31423c4a9704a2f38dbc6eab4a8c681b3dd (patch)
treeeed415d98ee24d23d7cd794a07e57bca54857845
parent398fdbe6590522e803cc4c4eac353bf5fc344552 (diff)
downloadtrollius-git-0acde31423c4a9704a2f38dbc6eab4a8c681b3dd.tar.gz
Python issue #23197: On SSL handshake failure on matching hostname, check if
the waiter is cancelled before setting its exception.
-rw-r--r--asyncio/selector_events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/asyncio/selector_events.py b/asyncio/selector_events.py
index ca86264..074a8df 100644
--- a/asyncio/selector_events.py
+++ b/asyncio/selector_events.py
@@ -774,7 +774,8 @@ class _SelectorSslTransport(_SelectorTransport):
"on matching the hostname",
self, exc_info=True)
self._sock.close()
- if self._waiter is not None:
+ if (self._waiter is not None
+ and not self._waiter.cancelled()):
self._waiter.set_exception(exc)
return