diff options
| author | Vincent LE GOFF <g_n_s@hotmail.fr> | 2019-05-22 15:30:10 +0200 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2019-05-22 09:30:10 -0400 |
| commit | de713ea871aee8effdafd7e976f6d409eb52efac (patch) | |
| tree | 539bc7d3b37c5e7f1965180cc1f6eeb402929fc7 /http/server.ts | |
| parent | b9ce3a6453d432df3150a4fceda5b205f5c21354 (diff) | |
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
Diffstat (limited to 'http/server.ts')
| -rw-r--r-- | http/server.ts | 8 |
1 files changed, 3 insertions, 5 deletions
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. |
