Fix a problem with connection waiters that are never awaited

aio-libs · Feb 9, 2020 · 6805b87 · 6805b87
1 parent ea8f35e
commit 6805b87
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES/4560.bugfix b/CHANGES/4560.bugfix
@@ -0,0 +1 @@
+Fix a problem with connection waiters that are never awaited.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -125,6 +125,7 @@ Igor Alexandrov
 Igor Davydenko
 Igor Mozharovsky
 Igor Pavlov
+Illia Volochii
 Ilya Chichak
 Ingmar Steen
 Ivan Larin

diff --git a/aiohttp/connector.py b/aiohttp/connector.py
@@ -480,7 +480,10 @@ async def connect(self, req: 'ClientRequest',
 
                 raise e
             finally:
-                if not waiters:
+                # `waiters` may be deleted from `self._waiters` by another
+                # coroutine, and `self._waiters[key]` may contain another
+                # deque, the later should not be deleted.
+                if not waiters and self._waiters[key] is waiters:
                     try:
                         del self._waiters[key]
                     except KeyError:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a problem with connection waiters that are never awaited.