std/http/server.ts: Abort read when connection closes

nayeemrmn · Jan 11, 2020 · ce8ebf6 · ce8ebf6
1 parent 1ea06f9
commit ce8ebf6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/std/http/server.ts b/std/http/server.ts
@@ -375,12 +375,17 @@ export async function readRequest(
 
 export class Server implements AsyncIterable<ServerRequest> {
   private closing = false;
+  private signalClose: () => void = () => {};
+  private signaledClose: Promise<void> = new Promise(
+    resolve => (this.signalClose = resolve)
+  );
 
   constructor(public listener: Listener) {}
 
   close(): void {
     this.closing = true;
     this.listener.close();
+    this.signalClose();
   }
 
   // Yields all HTTP requests on a single TCP connection.
@@ -394,7 +399,10 @@ export class Server implements AsyncIterable<ServerRequest> {
 
     while (!this.closing) {
       try {
-        req = await readRequest(conn, bufr);
+        req = await Promise.race([
+          this.signaledClose,
+          readRequest(conn, bufr)
+        ]) || Deno.EOF;
       } catch (e) {
         err = e;
         break;