1 files changed, 6 insertions, 9 deletions
diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js
index 1746b1d47..69ad88566 100644
--- a/ext/http/00_serve.js
+++ b/ext/http/00_serve.js
@@ -49,8 +49,6 @@ const {
 } = primordials;
 
 const {
-  op_http_wait,
-  op_http_upgrade_next,
   op_http_get_request_headers,
   op_http_get_request_method_and_url,
   op_http_read_request_body,
@@ -63,10 +61,9 @@ const {
   op_http_set_response_header,
   op_http_set_response_headers,
   op_http_upgrade_raw,
-  op_ws_server_create,
+  op_http_upgrade_websocket_next,
+  op_http_wait,
 } = core.generateAsyncOpHandler(
-  "op_http_wait",
-  "op_http_upgrade_next",
   "op_http_get_request_headers",
   "op_http_get_request_method_and_url",
   "op_http_read_request_body",
@@ -79,7 +76,8 @@ const {
   "op_http_set_response_header",
   "op_http_set_response_headers",
   "op_http_upgrade_raw",
-  "op_ws_server_create",
+  "op_http_upgrade_websocket_next",
+  "op_http_wait",
 );
 const _upgraded = Symbol("_upgraded");
 
@@ -208,12 +206,11 @@ class InnerRequest {
       // Start the upgrade in the background.
       (async () => {
         try {
-          // Returns the connection and extra bytes, which we can pass directly to op_ws_server_create
-          const upgrade = await op_http_upgrade_next(
+          // Returns the upgraded websocket connection
+          const wsRid = await op_http_upgrade_websocket_next(
             slabId,
             response.headerList,
           );
-          const wsRid = op_ws_server_create(upgrade[0], upgrade[1]);
 
           // We have to wait for the go-ahead signal
           await goAhead;