2 files changed, 6 insertions, 3 deletions
diff --git a/src/nodejs/unit-http/loader.mjs b/src/nodejs/unit-http/loader.mjs
index 546548f5..83985b0f 100644
--- a/src/nodejs/unit-http/loader.mjs
+++ b/src/nodejs/unit-http/loader.mjs
@@ -4,13 +4,15 @@ export async function resolve(specifier, context, defaultResolver) {
         case "websocket":
             return {
                 url: new URL("./websocket.js", import.meta.url).href,
-                format: "commonjs"
+                format: "commonjs",
+                shortCircuit: true,
             }
 
         case "http":
             return {
                 url: new URL("./http.js", import.meta.url).href,
-                format: "commonjs"
+                format: "commonjs",
+                shortCircuit: true,
             }
     }
 
diff --git a/src/nodejs/unit-http/unit.cpp b/src/nodejs/unit-http/unit.cpp
index ee5dc46f..7912d0ac 100644
--- a/src/nodejs/unit-http/unit.cpp
+++ b/src/nodejs/unit-http/unit.cpp
@@ -657,7 +657,8 @@ Unit::create_socket(napi_value server_obj, nxt_unit_request_info_t *req)
     req_data->sock_ref = wrap(res, req, sock_destroy);
 
     set_named_property(res, "remoteAddress", r->remote, r->remote_length);
-    set_named_property(res, "localAddress", r->local, r->local_length);
+    set_named_property(res, "localAddress", r->local_addr,
+                       r->local_addr_length);
 
     return res;
 }