diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2019-08-06 00:03:55 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2019-08-06 00:03:55 +0200 |
commit | 50fdccb17549eae05be2a68163f6e739cdf82b53 (patch) | |
tree | 1ff07965c6f069197c8c7c01b5e6b0f4bad666d0 /http/server.ts | |
parent | 782ebfbc0f317dff32daac40c42930abd6985f50 (diff) |
Revert "http: delete conn parameter in readRequest" (denoland/deno_std#550)
This reverts commit 209183e24812095a40e48e60484f80a5a254b1c3.
Fixes: denoland/deno_std#441
Original: https://github.com/denoland/deno_std/commit/3e17815c7e61cfd2e4c46a12649811543509d563
Diffstat (limited to 'http/server.ts')
-rw-r--r-- | http/server.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/http/server.ts b/http/server.ts index 54ec397d3..2b5fffc81 100644 --- a/http/server.ts +++ b/http/server.ts @@ -104,6 +104,7 @@ export class ServerRequest { protoMinor!: number; protoMajor!: number; headers!: Headers; + conn!: Conn; r!: BufReader; w!: BufWriter; done: Deferred<void> = deferred(); @@ -283,6 +284,7 @@ export function parseHTTPVersion(vers: string): [number, number] { } export async function readRequest( + conn: Conn, bufr: BufReader ): Promise<ServerRequest | Deno.EOF> { const tp = new TextProtoReader(bufr); @@ -292,6 +294,7 @@ export async function readRequest( if (headers === Deno.EOF) throw new UnexpectedEOFError(); const req = new ServerRequest(); + req.conn = conn; req.r = bufr; [req.method, req.url, req.proto] = firstLine.split(" ", 3); [req.protoMinor, req.protoMajor] = parseHTTPVersion(req.proto); @@ -321,7 +324,7 @@ export class Server implements AsyncIterable<ServerRequest> { while (!this.closing) { try { - req = await readRequest(bufr); + req = await readRequest(conn, bufr); } catch (e) { err = e; break; |