summaryrefslogtreecommitdiff
path: root/std/http
diff options
context:
space:
mode:
Diffstat (limited to 'std/http')
-rw-r--r--std/http/io.ts18
-rw-r--r--std/http/io_test.ts6
2 files changed, 12 insertions, 12 deletions
diff --git a/std/http/io.ts b/std/http/io.ts
index 477bab831..b53b52527 100644
--- a/std/http/io.ts
+++ b/std/http/io.ts
@@ -1,4 +1,4 @@
-import { BufReader, UnexpectedEOFError, BufWriter } from "../io/bufio.ts";
+import { BufReader, BufWriter } from "../io/bufio.ts";
import { TextProtoReader } from "../textproto/mod.ts";
import { assert } from "../testing/asserts.ts";
import { encoder } from "../strings/mod.ts";
@@ -57,13 +57,13 @@ export function chunkedBodyReader(h: Headers, r: BufReader): Deno.Reader {
chunks.shift();
// Consume \r\n;
if ((await tp.readLine()) === Deno.EOF) {
- throw new UnexpectedEOFError();
+ throw new Deno.errors.UnexpectedEof();
}
}
return readLength;
}
const line = await tp.readLine();
- if (line === Deno.EOF) throw new UnexpectedEOFError();
+ if (line === Deno.EOF) throw new Deno.errors.UnexpectedEof();
// TODO: handle chunk extension
const [chunkSizeString] = line.split(";");
const chunkSize = parseInt(chunkSizeString, 16);
@@ -74,12 +74,12 @@ export function chunkedBodyReader(h: Headers, r: BufReader): Deno.Reader {
if (chunkSize > buf.byteLength) {
let eof = await r.readFull(buf);
if (eof === Deno.EOF) {
- throw new UnexpectedEOFError();
+ throw new Deno.errors.UnexpectedEof();
}
const restChunk = new Uint8Array(chunkSize - buf.byteLength);
eof = await r.readFull(restChunk);
if (eof === Deno.EOF) {
- throw new UnexpectedEOFError();
+ throw new Deno.errors.UnexpectedEof();
} else {
chunks.push({
offset: 0,
@@ -91,11 +91,11 @@ export function chunkedBodyReader(h: Headers, r: BufReader): Deno.Reader {
const bufToFill = buf.subarray(0, chunkSize);
const eof = await r.readFull(bufToFill);
if (eof === Deno.EOF) {
- throw new UnexpectedEOFError();
+ throw new Deno.errors.UnexpectedEof();
}
// Consume \r\n
if ((await tp.readLine()) === Deno.EOF) {
- throw new UnexpectedEOFError();
+ throw new Deno.errors.UnexpectedEof();
}
return chunkSize;
}
@@ -103,7 +103,7 @@ export function chunkedBodyReader(h: Headers, r: BufReader): Deno.Reader {
assert(chunkSize === 0);
// Consume \r\n
if ((await r.readLine()) === Deno.EOF) {
- throw new UnexpectedEOFError();
+ throw new Deno.errors.UnexpectedEof();
}
await readTrailers(h, r);
finished = true;
@@ -348,7 +348,7 @@ export async function readRequest(
const firstLine = await tp.readLine(); // e.g. GET /index.html HTTP/1.0
if (firstLine === Deno.EOF) return Deno.EOF;
const headers = await tp.readMIMEHeader();
- if (headers === Deno.EOF) throw new UnexpectedEOFError();
+ if (headers === Deno.EOF) throw new Deno.errors.UnexpectedEof();
const req = new ServerRequest();
req.conn = conn;
diff --git a/std/http/io_test.ts b/std/http/io_test.ts
index acaa882f7..6c96d0b95 100644
--- a/std/http/io_test.ts
+++ b/std/http/io_test.ts
@@ -15,7 +15,7 @@ import {
writeResponse
} from "./io.ts";
import { encode, decode } from "../strings/mod.ts";
-import { BufReader, UnexpectedEOFError, ReadLineResult } from "../io/bufio.ts";
+import { BufReader, ReadLineResult } from "../io/bufio.ts";
import { chunkedBodyReader } from "./io.ts";
import { ServerRequest, Response } from "./server.ts";
import { StringReader } from "../io/readers.ts";
@@ -369,7 +369,7 @@ test(async function testReadRequestError(): Promise<void> {
},
{
in: "GET / HTTP/1.1\r\nheader:foo\r\n",
- err: UnexpectedEOFError
+ err: Deno.errors.UnexpectedEof
},
{ in: "", err: Deno.EOF },
{
@@ -437,7 +437,7 @@ test(async function testReadRequestError(): Promise<void> {
} else if (typeof test.err === "string") {
assertEquals(err.message, test.err);
} else if (test.err) {
- assert(err instanceof (test.err as typeof UnexpectedEOFError));
+ assert(err instanceof (test.err as typeof Deno.errors.UnexpectedEof));
} else {
assert(req instanceof ServerRequest);
assert(test.headers);