From de713ea871aee8effdafd7e976f6d409eb52efac Mon Sep 17 00:00:00 2001
From: Vincent LE GOFF <g_n_s@hotmail.fr>
Date: Wed, 22 May 2019 15:30:10 +0200
Subject: http: delete conn parameter in readRequest (denoland/deno_std#430)

To bring it inline with Go API
Original: https://github.com/denoland/deno_std/commit/209183e24812095a40e48e60484f80a5a254b1c3
---
 http/server.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'http/server.ts')

diff --git a/http/server.ts b/http/server.ts
index da335a58c..3886e7672 100644
--- a/http/server.ts
+++ b/http/server.ts
@@ -104,7 +104,6 @@ export class ServerRequest {
   method: string;
   proto: string;
   headers: Headers;
-  conn: Conn;
   r: BufReader;
   w: BufWriter;
   done: Deferred<void> = deferred();
@@ -199,13 +198,10 @@ export class ServerRequest {
 }
 
 async function readRequest(
-  conn: Conn,
   bufr: BufReader
 ): Promise<[ServerRequest, BufState]> {
   const req = new ServerRequest();
-  req.conn = conn;
   req.r = bufr;
-  req.w = new BufWriter(conn);
   const tp = new TextProtoReader(bufr);
   let err: BufState;
   // First line: GET /index.html HTTP/1.0
@@ -234,12 +230,14 @@ export class Server implements AsyncIterable<ServerRequest> {
     conn: Conn
   ): AsyncIterableIterator<ServerRequest> {
     const bufr = new BufReader(conn);
+    const w = new BufWriter(conn);
     let bufStateErr: BufState;
     let req: ServerRequest;
 
     while (!this.closing) {
-      [req, bufStateErr] = await readRequest(conn, bufr);
+      [req, bufStateErr] = await readRequest(bufr);
       if (bufStateErr) break;
+      req.w = w;
       yield req;
       // Wait for the request to be processed before we accept a new request on
       // this connection.
-- 
cgit v1.2.3