Remove heartbeat on closing connection on keepalive timeout (#3041)

aio-libs · Jun 1, 2018 · 52d7e3a · 52d7e3a
1 parent e021a01
commit 52d7e3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES/3041.feature b/CHANGES/3041.feature
@@ -0,0 +1,2 @@
+Remove heartbeat on closing connection on keepalive timeout.
+The used hack violates HTTP protocol.
diff --git a/aiohttp/web_protocol.py b/aiohttp/web_protocol.py
@@ -286,14 +286,12 @@ def close(self):
         if self._waiter:
             self._waiter.cancel()
 
-    def force_close(self, send_last_heartbeat=False):
+    def force_close(self):
         """Force close connection"""
         self._force_close = True
         if self._waiter:
             self._waiter.cancel()
         if self.transport is not None:
-            if send_last_heartbeat:
-                self.transport.write(b"\r\n")
             self.transport.close()
             self.transport = None
 
@@ -317,7 +315,7 @@ def _process_keepalive(self):
         # handler in idle state
         if self._waiter:
             if self._loop.time() > next:
-                self.force_close(send_last_heartbeat=True)
+                self.force_close()
                 return
 
         # not all request handlers are done,