From b87364bd919f53a7e31f49cc871c70cf34bfd43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=2E=20K=C3=A4rkk=C3=A4inen?=
 <tronic@users.noreply.github.com>
Date: Wed, 26 Feb 2020 19:00:38 +0200
Subject: [PATCH] All tests OK.

---
 sanic/asgi.py    | 19 ++++++-------------
 sanic/request.py |  2 +-
 sanic/server.py  | 22 +++++++++++++++++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/sanic/asgi.py b/sanic/asgi.py
index b1ebc9c3..0234d7c2 100644
--- a/sanic/asgi.py
+++ b/sanic/asgi.py
@@ -253,7 +253,8 @@ class ASGIApp:
             )
 
             instance.request.stream = StreamBuffer(
-                sanic_app.config.REQUEST_BUFFER_QUEUE_SIZE
+                sanic_app.config.REQUEST_BUFFER_QUEUE_SIZE,
+                protocol=instance
             )
 
         return instance
@@ -275,23 +276,15 @@ class ASGIApp:
         """
         Read and stream the body in chunks from an incoming ASGI message.
         """
-        more_body = True
-
-        while more_body:
-            message = await self.transport.receive()
-            chunk = message.get("body", b"")
-            await self.request.stream.put(chunk)
-
-            more_body = message.get("more_body", False)
-
-        await self.request.stream.put(None)
+        message = await self.transport.receive()
+        if not message.get("more_body", False):
+            return None
+        return message.get("body", b"")
 
     async def __call__(self) -> None:
         """
         Handle the incoming request.
         """
-        self.sanic_app.loop.create_task(self.stream_body())
-
         handler = self.sanic_app.handle_request
         callback = None if self.ws else self.stream_callback
         await handler(self.request, None, callback)
diff --git a/sanic/request.py b/sanic/request.py
index eaca4a67..5328fe70 100644
--- a/sanic/request.py
+++ b/sanic/request.py
@@ -54,7 +54,7 @@ class StreamBuffer:
     async def read(self):
         """ Stop reading when gets None """
         if self._protocol:
-            return await self._protocol.request_body()
+            return await self._protocol.stream_body()
         payload = await self._queue.get()
         self._queue.task_done()
         return payload
diff --git a/sanic/server.py b/sanic/server.py
index 4222c279..a1bbd226 100644
--- a/sanic/server.py
+++ b/sanic/server.py
@@ -94,6 +94,7 @@ class HttpProtocol(asyncio.Protocol):
         "_can_write",
         "_data_received",
         "_task",
+        "_exception",
     )
 
     def __init__(
@@ -197,19 +198,23 @@ class HttpProtocol(asyncio.Protocol):
         if (status == Status.IDLE and duration > self.keep_alive_timeout):
             logger.debug("KeepAlive Timeout. Closing connection.")
         elif (status == Status.REQUEST and duration > self.request_timeout):
-            self.write_error(RequestTimeout("Request Timeout"))
+            self._exception = RequestTimeout("Request Timeout")
         elif (status.value > Status.REQUEST.value and duration > self.response_timeout):
-            self.write_error(ServiceUnavailable("Response Timeout"))
+            self._exception = ServiceUnavailable("Response Timeout")
         else:
             self.loop.call_later(.1, self.check_timeouts)
             return
-        self.close()
+        self._task.cancel()
 
 
     async def http1(self):
         """HTTP 1.1 connection handler"""
         try:
+            self._exception = None
             buf = self._buffer
+            # Note: connections are initially in request mode and do not obey
+            # keep-alive timeout like with some other servers.
+            self._status = Status.REQUEST
             while self.keep_alive:
                 # Read request header
                 pos = 0
@@ -248,6 +253,8 @@ class HttpProtocol(asyncio.Protocol):
                     transport=self.transport,
                     app=self.app,
                 )
+                if headers.get("connection", "").lower() == "close":
+                    self.keep_alive = False
                 # Prepare for request body
                 body = (
                     headers.get("transfer-encoding") == "chunked"
@@ -277,8 +284,13 @@ class HttpProtocol(asyncio.Protocol):
                 # Consume any remaining request body
                 if self._request_bytes_left or self._request_chunked:
                     logger.error(f"Handler of {method} {self.url} did not consume request body.")
-                    while await self.request_body(): pass
+                    while await self.stream_body(): pass
                 self._status, self._time = Status.IDLE, current_time()
+        except asyncio.CancelledError:
+            self.write_error(
+                self._exception or
+                ServiceUnavailable("Request handler cancelled")
+            )
         except SanicException as e:
             self.write_error(e)
         except Exception as e:
@@ -286,7 +298,7 @@ class HttpProtocol(asyncio.Protocol):
         finally:
             self.close()
 
-    async def request_body(self):
+    async def stream_body(self):
         buf = self._buffer
         if self._request_chunked and self._request_bytes_left == 0:
             # Process a chunk header: \r\n<size>[;<chunk extensions>]\r\n