Revert "Redesign of http server module (denoland/deno_std#188)"

We need to consider the API changes here more carefully.

This reverts commit da188a7d30cbf71317b46015ee63a06437c09aeb.
and commit 8569f15207bdc12c2c8ca81e9d020955be54918b.

Original: https://github.com/denoland/deno_std/commit/57c9176b19bf4f4580466e088c249cbe9b145119

1 files changed, 6 insertions, 6 deletions

diff --git a/http/file_server.ts b/http/file_server.ts
index 4aebd4957..1f3fdd586 100755
--- a/http/file_server.ts
+++ b/http/file_server.ts
@@ -10,7 +10,7 @@ import {
   listenAndServe,
   ServerRequest,
   setContentLength,
-  ServerResponse
+  Response
 } from "./server.ts";
 import { cwd, DenoError, ErrorKind, args, stat, readDir, open } from "deno";
 import { extname } from "../fs/path.ts";
@@ -195,14 +195,14 @@ async function serveFallback(req: ServerRequest, e: Error) {
   }
 }
 
-function serverLog(req: ServerRequest, res: ServerResponse) {
+function serverLog(req: ServerRequest, res: Response) {
   const d = new Date().toISOString();
   const dateFmt = `[${d.slice(0, 10)} ${d.slice(11, 19)}]`;
   const s = `${dateFmt} "${req.method} ${req.url} ${req.proto}" ${res.status}`;
   console.log(s);
 }
 
-function setCORS(res: ServerResponse) {
+function setCORS(res: Response) {
   if (!res.headers) {
     res.headers = new Headers();
   }
@@ -213,11 +213,11 @@ function setCORS(res: ServerResponse) {
   );
 }
 
-listenAndServe(addr, async (req, res) => {
+listenAndServe(addr, async req => {
   const fileName = req.url.replace(/\/$/, "");
   const filePath = currentDir + fileName;
 
-  let response: ServerResponse;
+  let response: Response;
 
   try {
     const fileInfo = await stat(filePath);
@@ -235,7 +235,7 @@ listenAndServe(addr, async (req, res) => {
       setCORS(response);
     }
     serverLog(req, response);
-    res.respond(response);
+    req.respond(response);
   }
 });