Close idle keep-alive connections on shutdown (#1222)

Fixing #1221
aio-libs · Sep 29, 2016 · a93d9c2 · a93d9c2
1 parent 94e0fb6
commit a93d9c2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/aiohttp/server.py b/aiohttp/server.py
@@ -154,7 +154,10 @@ def shutdown(self, timeout=15.0):
             return
         self._closing = True
 
-        if timeout:
+        if self._request_count > 1 and not self._reading_request:
+            # force-close idle keep-alive connections
+            self._request_handler.cancel()
+        elif timeout:
             canceller = self._loop.call_later(timeout,
                                               self._request_handler.cancel)
             with suppress(asyncio.CancelledError):