2 files changed, 1 insertions, 45 deletions

diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js
index 1bdcbd5d3..578eb718f 100644
--- a/ext/http/00_serve.js
+++ b/ext/http/00_serve.js
@@ -154,12 +154,6 @@ class InnerRequest {
       throw new Deno.errors.Http("already closed");
     }
 
-    // upgradeHttp is async
-    // TODO(mmastrac)
-    if (upgradeType == "upgradeHttp") {
-      throw "upgradeHttp is unavailable in Deno.serve at this time";
-    }
-
     // upgradeHttpRaw is sync
     if (upgradeType == "upgradeHttpRaw") {
       const external = this.#external;
diff --git a/ext/http/01_http.js b/ext/http/01_http.js
index 92f1fd03e..6e8e9a0b3 100644
--- a/ext/http/01_http.js
+++ b/ext/http/01_http.js
@@ -9,7 +9,6 @@ const {
   op_http_accept,
   op_http_headers,
   op_http_shutdown,
-  op_http_upgrade,
   op_http_upgrade_websocket,
   op_http_websocket_accept_header,
   op_http_write,
@@ -20,7 +19,6 @@ const {
   ArrayPrototypeIncludes,
   ArrayPrototypeMap,
   ArrayPrototypePush,
-  Error,
   ObjectPrototypeIsPrototypeOf,
   SafeSet,
   SafeSetIterator,
@@ -67,10 +65,7 @@ import {
   SERVER,
   WebSocket,
 } from "ext:deno_websocket/01_websocket.js";
-import { TcpConn, UnixConn } from "ext:deno_net/01_net.js";
-import { TlsConn } from "ext:deno_net/02_tls.js";
 import {
-  Deferred,
   getReadableStreamResourceBacking,
   readableStreamClose,
   readableStreamForRid,
@@ -80,7 +75,6 @@ import { serve } from "ext:deno_http/00_serve.js";
 import { SymbolDispose } from "ext:deno_web/00_infra.js";
 
 const connErrorSymbol = Symbol("connError");
-const _deferred = Symbol("upgradeHttpDeferred");
 
 /** @type {(self: HttpConn, rid: number) => boolean} */
 let deleteManagedResource;
@@ -174,9 +168,6 @@ class HttpConn {
     const respondWith = createRespondWith(
       this,
       streamRid,
-      request,
-      this.#remoteAddr,
-      this.#localAddr,
       abortController,
     );
 
@@ -219,9 +210,6 @@ class HttpConn {
 function createRespondWith(
   httpConn,
   streamRid,
-  request,
-  remoteAddr,
-  localAddr,
   abortController,
 ) {
   return async function respondWith(resp) {
@@ -379,22 +367,6 @@ function createRespondWith(
         }
       }
 
-      const deferred = request[_deferred];
-      if (deferred) {
-        const res = await op_http_upgrade(streamRid);
-        let conn;
-        if (res.connType === "tcp") {
-          conn = new TcpConn(res.connRid, remoteAddr, localAddr);
-        } else if (res.connType === "tls") {
-          conn = new TlsConn(res.connRid, remoteAddr, localAddr);
-        } else if (res.connType === "unix") {
-          conn = new UnixConn(res.connRid, remoteAddr, localAddr);
-        } else {
-          throw new Error("unreachable");
-        }
-
-        deferred.resolve([conn, res.readBuf]);
-      }
       const ws = resp[_ws];
       if (ws) {
         const wsRid = await op_http_upgrade_websocket(
@@ -502,16 +474,6 @@ function upgradeWebSocket(request, options = {}) {
   return { response, socket };
 }
 
-function upgradeHttp(req) {
-  const inner = toInnerRequest(req);
-  if (inner._wantsUpgrade) {
-    return inner._wantsUpgrade("upgradeHttp", arguments);
-  }
-
-  req[_deferred] = new Deferred();
-  return req[_deferred].promise;
-}
-
 const spaceCharCode = StringPrototypeCharCodeAt(" ", 0);
 const tabCharCode = StringPrototypeCharCodeAt("\t", 0);
 const commaCharCode = StringPrototypeCharCodeAt(",", 0);
@@ -589,4 +551,4 @@ function buildCaseInsensitiveCommaValueFinder(checkText) {
 internals.buildCaseInsensitiveCommaValueFinder =
   buildCaseInsensitiveCommaValueFinder;
 
-export { _ws, HttpConn, serve, upgradeHttp, upgradeWebSocket };
+export { _ws, HttpConn, serve, upgradeWebSocket };