diff options
| -rw-r--r-- | http/README.md | 2 | ||||
| -rwxr-xr-x | http/file_server.ts | 2 | ||||
| -rw-r--r-- | http/mod.ts | 7 | ||||
| -rw-r--r-- | http/server.ts (renamed from http/http.ts) | 0 | ||||
| -rw-r--r-- | http/server_test.ts (renamed from http/http_test.ts) | 2 | ||||
| -rwxr-xr-x | test.ts | 2 | ||||
| -rw-r--r-- | ws/mod.ts | 2 | ||||
| -rw-r--r-- | ws/test.ts | 2 |
8 files changed, 6 insertions, 13 deletions
diff --git a/http/README.md b/http/README.md index c598cdef4..2c9a90853 100644 --- a/http/README.md +++ b/http/README.md @@ -5,7 +5,7 @@ A framework for creating HTTP/HTTPS server. ## Example ```typescript -import { serve } from "https://deno.land/x/http/mod.ts"; +import { serve } from "https://deno.land/x/http/server.ts"; const s = serve("0.0.0.0:8000"); async function main() { diff --git a/http/file_server.ts b/http/file_server.ts index 4437a44e4..d1a34ab79 100755 --- a/http/file_server.ts +++ b/http/file_server.ts @@ -10,7 +10,7 @@ import { ServerRequest, setContentLength, Response -} from "./mod.ts"; +} from "./server.ts"; import { cwd, DenoError, ErrorKind, args, stat, readDir, open } from "deno"; import { extname } from "../fs/path.ts"; import { contentType } from "../media_types/mod.ts"; diff --git a/http/mod.ts b/http/mod.ts deleted file mode 100644 index a89f04417..000000000 --- a/http/mod.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { - serve, - listenAndServe, - Response, - setContentLength, - ServerRequest -} from "./http.ts"; diff --git a/http/http.ts b/http/server.ts index fe25a5f6e..fe25a5f6e 100644 --- a/http/http.ts +++ b/http/server.ts diff --git a/http/http_test.ts b/http/server_test.ts index ba0cec3e3..5fdb63ceb 100644 --- a/http/http_test.ts +++ b/http/server_test.ts @@ -12,7 +12,7 @@ import { ServerRequest, setContentLength, Response -} from "./mod.ts"; +} from "./server.ts"; import { BufWriter, BufReader } from "../io/bufio.ts"; interface ResponseTest { @@ -15,7 +15,7 @@ import "fs/path/zero_length_strings_test.ts"; import "io/bufio_test.ts"; import "io/ioutil_test.ts"; import "io/util_test.ts"; -import "http/http_test.ts"; +import "http/server_test.ts"; import "http/file_server_test.ts"; import "log/test.ts"; import "log/handlers_test.ts"; @@ -1,6 +1,6 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. import { Buffer, Writer, Conn } from "deno"; -import { ServerRequest } from "../http/http.ts"; +import { ServerRequest } from "../http/server.ts"; import { BufReader, BufWriter } from "../io/bufio.ts"; import { readLong, readShort, sliceLongToBytes } from "../io/ioutil.ts"; import { Sha1 } from "./sha1.ts"; diff --git a/ws/test.ts b/ws/test.ts index 67a194639..252d8775b 100644 --- a/ws/test.ts +++ b/ws/test.ts @@ -3,7 +3,7 @@ import { Buffer } from "deno"; import { BufReader } from "../io/bufio.ts"; import { test, assert, assertEqual } from "../testing/mod.ts"; import { createSecAccept, OpCode, readFrame, unmask } from "./mod.ts"; -import { serve } from "../http/http.ts"; +import { serve } from "../http/server.ts"; test(async function testReadUnmaskedTextFrame() { // unmasked single text frame with payload "Hello" |