diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae538a2dbe5..cc6daf1589d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V22.md#22.23.1">22.23.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V22.md#22.23.2">22.23.2</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V22.md#22.23.1">22.23.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.23.0">22.23.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.22.3">22.22.3</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.22.2">22.22.2</a><br/>
diff --git a/deps/llhttp/.gitignore b/deps/llhttp/.gitignore
deleted file mode 100644
index 98438a2cd32..00000000000
--- a/deps/llhttp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libllhttp.pc
diff --git a/deps/llhttp/CMakeLists.txt b/deps/llhttp/CMakeLists.txt
index 856f9fd09a9..e4629bf1cd2 100644
--- a/deps/llhttp/CMakeLists.txt
+++ b/deps/llhttp/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.25.0)
 cmake_policy(SET CMP0069 NEW)
 
-project(llhttp VERSION 9.4.2)
+project(llhttp VERSION 9.4.3)
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
diff --git a/deps/llhttp/include/llhttp.h b/deps/llhttp/include/llhttp.h
index 5670da52296..da24ef156ef 100644
--- a/deps/llhttp/include/llhttp.h
+++ b/deps/llhttp/include/llhttp.h
@@ -4,7 +4,7 @@
 
 #define LLHTTP_VERSION_MAJOR 9
 #define LLHTTP_VERSION_MINOR 4
-#define LLHTTP_VERSION_PATCH 2
+#define LLHTTP_VERSION_PATCH 3
 
 #ifndef INCLUDE_LLHTTP_ITSELF_H_
 #define INCLUDE_LLHTTP_ITSELF_H_
diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
index cbbb36cd955..73545770337 100644
--- a/deps/llhttp/src/llhttp.c
+++ b/deps/llhttp/src/llhttp.c
@@ -402,7 +402,7 @@ enum llparse_state_e {
   s_n_llhttp__internal__n_invoke_test_lenient_flags_17,
   s_n_llhttp__internal__n_header_value_lenient,
   s_n_llhttp__internal__n_header_value_relaxed,
-  s_n_llhttp__internal__n_error_54,
+  s_n_llhttp__internal__n_error_55,
   s_n_llhttp__internal__n_header_value_otherwise,
   s_n_llhttp__internal__n_header_value_connection_token,
   s_n_llhttp__internal__n_header_value_connection_ws,
@@ -410,12 +410,12 @@ enum llparse_state_e {
   s_n_llhttp__internal__n_header_value_connection_2,
   s_n_llhttp__internal__n_header_value_connection_3,
   s_n_llhttp__internal__n_header_value_connection,
-  s_n_llhttp__internal__n_error_56,
   s_n_llhttp__internal__n_error_57,
+  s_n_llhttp__internal__n_error_58,
   s_n_llhttp__internal__n_header_value_content_length_ws,
   s_n_llhttp__internal__n_header_value_content_length,
+  s_n_llhttp__internal__n_error_60,
   s_n_llhttp__internal__n_error_59,
-  s_n_llhttp__internal__n_error_58,
   s_n_llhttp__internal__n_header_value_te_token_ows,
   s_n_llhttp__internal__n_header_value,
   s_n_llhttp__internal__n_header_value_te_token,
@@ -448,18 +448,18 @@ enum llparse_state_e {
   s_n_llhttp__internal__n_req_http_complete,
   s_n_llhttp__internal__n_invoke_load_method_1,
   s_n_llhttp__internal__n_invoke_llhttp__on_version_complete,
-  s_n_llhttp__internal__n_error_67,
-  s_n_llhttp__internal__n_error_74,
-  s_n_llhttp__internal__n_req_http_minor,
+  s_n_llhttp__internal__n_error_68,
   s_n_llhttp__internal__n_error_75,
-  s_n_llhttp__internal__n_req_http_dot,
+  s_n_llhttp__internal__n_req_http_minor,
   s_n_llhttp__internal__n_error_76,
+  s_n_llhttp__internal__n_req_http_dot,
+  s_n_llhttp__internal__n_error_77,
   s_n_llhttp__internal__n_req_http_major,
   s_n_llhttp__internal__n_span_start_llhttp__on_version,
   s_n_llhttp__internal__n_req_after_protocol,
   s_n_llhttp__internal__n_invoke_load_method,
   s_n_llhttp__internal__n_invoke_llhttp__on_protocol_complete,
-  s_n_llhttp__internal__n_error_82,
+  s_n_llhttp__internal__n_error_83,
   s_n_llhttp__internal__n_req_after_http_start_1,
   s_n_llhttp__internal__n_invoke_load_method_2,
   s_n_llhttp__internal__n_invoke_llhttp__on_protocol_complete_1,
@@ -576,17 +576,17 @@ enum llparse_state_e {
   s_n_llhttp__internal__n_res_status_code_digit_1,
   s_n_llhttp__internal__n_res_after_version,
   s_n_llhttp__internal__n_invoke_llhttp__on_version_complete_1,
-  s_n_llhttp__internal__n_error_93,
-  s_n_llhttp__internal__n_error_107,
-  s_n_llhttp__internal__n_res_http_minor,
+  s_n_llhttp__internal__n_error_94,
   s_n_llhttp__internal__n_error_108,
-  s_n_llhttp__internal__n_res_http_dot,
+  s_n_llhttp__internal__n_res_http_minor,
   s_n_llhttp__internal__n_error_109,
+  s_n_llhttp__internal__n_res_http_dot,
+  s_n_llhttp__internal__n_error_110,
   s_n_llhttp__internal__n_res_http_major,
   s_n_llhttp__internal__n_span_start_llhttp__on_version_1,
   s_n_llhttp__internal__n_res_after_protocol,
   s_n_llhttp__internal__n_invoke_llhttp__on_protocol_complete_3,
-  s_n_llhttp__internal__n_error_115,
+  s_n_llhttp__internal__n_error_116,
   s_n_llhttp__internal__n_res_after_start_1,
   s_n_llhttp__internal__n_res_after_start_2,
   s_n_llhttp__internal__n_res_after_start_3,
@@ -2227,7 +2227,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_header_value_lws;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_53;
+          goto s_n_llhttp__internal__n_error_54;
         }
       }
       UNREACHABLE;
@@ -2238,7 +2238,7 @@ static llparse_state_t llhttp__internal__run(
         case 1:
           goto s_n_llhttp__internal__n_header_value_almost_done;
         default:
-          goto s_n_llhttp__internal__n_error_51;
+          goto s_n_llhttp__internal__n_error_52;
       }
       UNREACHABLE;
     }
@@ -2400,8 +2400,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_54:
-    s_n_llhttp__internal__n_error_54: {
+    case s_n_llhttp__internal__n_error_55:
+    s_n_llhttp__internal__n_error_55: {
       state->error = 0xa;
       state->reason = "Invalid header value char";
       state->error_pos = (const char*) p;
@@ -2596,8 +2596,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_56:
-    s_n_llhttp__internal__n_error_56: {
+    case s_n_llhttp__internal__n_error_57:
+    s_n_llhttp__internal__n_error_57: {
       state->error = 0xb;
       state->reason = "Content-Length overflow";
       state->error_pos = (const char*) p;
@@ -2605,8 +2605,8 @@ static llparse_state_t llhttp__internal__run(
       return s_error;
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_57:
-    s_n_llhttp__internal__n_error_57: {
+    case s_n_llhttp__internal__n_error_58:
+    s_n_llhttp__internal__n_error_58: {
       state->error = 0xb;
       state->reason = "Invalid character in Content-Length";
       state->error_pos = (const char*) p;
@@ -2702,8 +2702,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_59:
-    s_n_llhttp__internal__n_error_59: {
+    case s_n_llhttp__internal__n_error_60:
+    s_n_llhttp__internal__n_error_60: {
       state->error = 0xf;
       state->reason = "Invalid `Transfer-Encoding` header value";
       state->error_pos = (const char*) p;
@@ -2711,8 +2711,8 @@ static llparse_state_t llhttp__internal__run(
       return s_error;
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_58:
-    s_n_llhttp__internal__n_error_58: {
+    case s_n_llhttp__internal__n_error_59:
+    s_n_llhttp__internal__n_error_59: {
       state->error = 0xf;
       state->reason = "Invalid `Transfer-Encoding` header value";
       state->error_pos = (const char*) p;
@@ -3031,7 +3031,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_span_end_llhttp__on_header_field_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_62;
+          goto s_n_llhttp__internal__n_error_63;
         }
       }
       UNREACHABLE;
@@ -3415,7 +3415,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_to_http_09;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_63;
+          goto s_n_llhttp__internal__n_error_64;
         }
       }
       UNREACHABLE;
@@ -3439,7 +3439,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_skip_lf_to_http09_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_63;
+          goto s_n_llhttp__internal__n_error_64;
         }
       }
       UNREACHABLE;
@@ -3456,13 +3456,13 @@ static llparse_state_t llhttp__internal__run(
       switch (match_seq.status) {
         case kMatchComplete: {
           p++;
-          goto s_n_llhttp__internal__n_error_72;
+          goto s_n_llhttp__internal__n_error_73;
         }
         case kMatchPause: {
           return s_n_llhttp__internal__n_req_pri_upgrade;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_73;
+          goto s_n_llhttp__internal__n_error_74;
         }
       }
       UNREACHABLE;
@@ -3498,7 +3498,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_req_http_complete_crlf;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_71;
+          goto s_n_llhttp__internal__n_error_72;
         }
       }
       UNREACHABLE;
@@ -3521,12 +3521,12 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_21;
         default:
-          goto s_n_llhttp__internal__n_error_68;
+          goto s_n_llhttp__internal__n_error_69;
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_67:
-    s_n_llhttp__internal__n_error_67: {
+    case s_n_llhttp__internal__n_error_68:
+    s_n_llhttp__internal__n_error_68: {
       state->error = 0x9;
       state->reason = "Invalid HTTP version";
       state->error_pos = (const char*) p;
@@ -3534,8 +3534,8 @@ static llparse_state_t llhttp__internal__run(
       return s_error;
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_74:
-    s_n_llhttp__internal__n_error_74: {
+    case s_n_llhttp__internal__n_error_75:
+    s_n_llhttp__internal__n_error_75: {
       state->error = 0x9;
       state->reason = "Invalid minor version";
       state->error_pos = (const char*) p;
@@ -3605,8 +3605,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_75:
-    s_n_llhttp__internal__n_error_75: {
+    case s_n_llhttp__internal__n_error_76:
+    s_n_llhttp__internal__n_error_76: {
       state->error = 0x9;
       state->reason = "Expected dot";
       state->error_pos = (const char*) p;
@@ -3630,8 +3630,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_76:
-    s_n_llhttp__internal__n_error_76: {
+    case s_n_llhttp__internal__n_error_77:
+    s_n_llhttp__internal__n_error_77: {
       state->error = 0x9;
       state->reason = "Invalid major version";
       state->error_pos = (const char*) p;
@@ -3722,7 +3722,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_span_start_llhttp__on_version;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_77;
+          goto s_n_llhttp__internal__n_error_78;
         }
       }
       UNREACHABLE;
@@ -3803,7 +3803,7 @@ static llparse_state_t llhttp__internal__run(
         case 46:
           goto s_n_llhttp__internal__n_req_after_protocol;
         default:
-          goto s_n_llhttp__internal__n_error_66;
+          goto s_n_llhttp__internal__n_error_67;
       }
       UNREACHABLE;
     }
@@ -3815,12 +3815,12 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_22;
         default:
-          goto s_n_llhttp__internal__n_error_65;
+          goto s_n_llhttp__internal__n_error_66;
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_82:
-    s_n_llhttp__internal__n_error_82: {
+    case s_n_llhttp__internal__n_error_83:
+    s_n_llhttp__internal__n_error_83: {
       state->error = 0x8;
       state->reason = "Expected HTTP/, RTSP/ or ICE/";
       state->error_pos = (const char*) p;
@@ -3857,7 +3857,7 @@ static llparse_state_t llhttp__internal__run(
         case 33:
           goto s_n_llhttp__internal__n_req_after_protocol;
         default:
-          goto s_n_llhttp__internal__n_error_79;
+          goto s_n_llhttp__internal__n_error_80;
       }
       UNREACHABLE;
     }
@@ -3869,7 +3869,7 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_23;
         default:
-          goto s_n_llhttp__internal__n_error_78;
+          goto s_n_llhttp__internal__n_error_79;
       }
       UNREACHABLE;
     }
@@ -3928,7 +3928,7 @@ static llparse_state_t llhttp__internal__run(
         case 45:
           goto s_n_llhttp__internal__n_req_after_protocol;
         default:
-          goto s_n_llhttp__internal__n_error_81;
+          goto s_n_llhttp__internal__n_error_82;
       }
       UNREACHABLE;
     }
@@ -3940,7 +3940,7 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_24;
         default:
-          goto s_n_llhttp__internal__n_error_80;
+          goto s_n_llhttp__internal__n_error_81;
       }
       UNREACHABLE;
     }
@@ -4100,7 +4100,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_fragment;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_83;
+          goto s_n_llhttp__internal__n_error_84;
         }
       }
       UNREACHABLE;
@@ -4159,7 +4159,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_span_end_stub_query_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_84;
+          goto s_n_llhttp__internal__n_error_85;
         }
       }
       UNREACHABLE;
@@ -4196,7 +4196,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_query;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_85;
+          goto s_n_llhttp__internal__n_error_86;
         }
       }
       UNREACHABLE;
@@ -4316,10 +4316,10 @@ static llparse_state_t llhttp__internal__run(
         }
         case 8: {
           p++;
-          goto s_n_llhttp__internal__n_error_86;
+          goto s_n_llhttp__internal__n_error_87;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_87;
+          goto s_n_llhttp__internal__n_error_88;
         }
       }
       UNREACHABLE;
@@ -4377,7 +4377,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_server_with_at;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_88;
+          goto s_n_llhttp__internal__n_error_89;
         }
       }
       UNREACHABLE;
@@ -4393,7 +4393,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_server;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       UNREACHABLE;
@@ -4429,7 +4429,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_schema_delim_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_89;
+          goto s_n_llhttp__internal__n_error_90;
         }
       }
       UNREACHABLE;
@@ -4479,7 +4479,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_90;
+          goto s_n_llhttp__internal__n_error_91;
         }
       }
       UNREACHABLE;
@@ -4519,7 +4519,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_url_schema;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_91;
+          goto s_n_llhttp__internal__n_error_92;
         }
       }
       UNREACHABLE;
@@ -4611,7 +4611,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_req_spaces_before_url;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_92;
+          goto s_n_llhttp__internal__n_error_93;
         }
       }
       UNREACHABLE;
@@ -4624,7 +4624,7 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_29;
         default:
-          goto s_n_llhttp__internal__n_error_111;
+          goto s_n_llhttp__internal__n_error_112;
       }
       UNREACHABLE;
     }
@@ -4640,7 +4640,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4664,7 +4664,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4684,7 +4684,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4708,7 +4708,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_4;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4732,7 +4732,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_6;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4756,7 +4756,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_8;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4773,7 +4773,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4793,7 +4793,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_9;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4813,7 +4813,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_7;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4837,7 +4837,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_12;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4861,7 +4861,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_13;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4881,7 +4881,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_13;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4897,7 +4897,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_11;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4921,7 +4921,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_14;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4945,7 +4945,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_17;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -4985,7 +4985,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_15;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5009,7 +5009,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_18;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5033,7 +5033,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_20;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5057,7 +5057,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_21;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5077,7 +5077,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_21;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5101,7 +5101,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_23;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5125,7 +5125,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_24;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5149,7 +5149,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_26;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5173,7 +5173,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_28;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5190,7 +5190,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5210,7 +5210,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_29;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5230,7 +5230,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_27;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5254,7 +5254,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_30;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5282,7 +5282,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_30;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5306,7 +5306,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_31;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5330,7 +5330,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_32;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5354,7 +5354,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_35;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5378,7 +5378,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_36;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5398,7 +5398,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_36;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5422,7 +5422,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_37;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5446,7 +5446,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_38;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5470,7 +5470,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_42;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5494,7 +5494,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_43;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5514,7 +5514,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_43;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5530,7 +5530,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_41;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5551,7 +5551,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_40;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5575,7 +5575,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_45;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5596,7 +5596,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5628,7 +5628,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_44;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5652,7 +5652,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_46;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5676,7 +5676,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_49;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5700,7 +5700,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_50;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5724,7 +5724,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_51;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5748,7 +5748,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_52;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5776,7 +5776,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_52;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5792,7 +5792,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_48;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5816,7 +5816,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_55;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5833,7 +5833,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_store_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5857,7 +5857,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_58;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5877,7 +5877,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_58;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5897,7 +5897,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_56;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5921,7 +5921,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_59;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5945,7 +5945,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_60;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5969,7 +5969,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_60;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -5993,7 +5993,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_62;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6017,7 +6017,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_63;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6037,7 +6037,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_63;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6061,7 +6061,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_66;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6085,7 +6085,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_68;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6109,7 +6109,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_69;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6129,7 +6129,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_69;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6153,7 +6153,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_after_start_req_70;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6177,7 +6177,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_70;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6193,7 +6193,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_65;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6273,7 +6273,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_after_start_req_64;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_112;
+          goto s_n_llhttp__internal__n_error_113;
         }
       }
       UNREACHABLE;
@@ -6310,7 +6310,7 @@ static llparse_state_t llhttp__internal__run(
         case 1:
           goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete;
         default:
-          goto s_n_llhttp__internal__n_error_98;
+          goto s_n_llhttp__internal__n_error_99;
       }
       UNREACHABLE;
     }
@@ -6362,7 +6362,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_span_start_llhttp__on_status;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_99;
+          goto s_n_llhttp__internal__n_error_100;
         }
       }
       UNREACHABLE;
@@ -6424,7 +6424,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code_2;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_101;
+          goto s_n_llhttp__internal__n_error_102;
         }
       }
       UNREACHABLE;
@@ -6486,7 +6486,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_103;
+          goto s_n_llhttp__internal__n_error_104;
         }
       }
       UNREACHABLE;
@@ -6548,7 +6548,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_mul_add_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_105;
+          goto s_n_llhttp__internal__n_error_106;
         }
       }
       UNREACHABLE;
@@ -6564,7 +6564,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_invoke_update_status_code;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_106;
+          goto s_n_llhttp__internal__n_error_107;
         }
       }
       UNREACHABLE;
@@ -6577,12 +6577,12 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_28;
         default:
-          goto s_n_llhttp__internal__n_error_94;
+          goto s_n_llhttp__internal__n_error_95;
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_93:
-    s_n_llhttp__internal__n_error_93: {
+    case s_n_llhttp__internal__n_error_94:
+    s_n_llhttp__internal__n_error_94: {
       state->error = 0x9;
       state->reason = "Invalid HTTP version";
       state->error_pos = (const char*) p;
@@ -6590,8 +6590,8 @@ static llparse_state_t llhttp__internal__run(
       return s_error;
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_107:
-    s_n_llhttp__internal__n_error_107: {
+    case s_n_llhttp__internal__n_error_108:
+    s_n_llhttp__internal__n_error_108: {
       state->error = 0x9;
       state->reason = "Invalid minor version";
       state->error_pos = (const char*) p;
@@ -6661,8 +6661,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_108:
-    s_n_llhttp__internal__n_error_108: {
+    case s_n_llhttp__internal__n_error_109:
+    s_n_llhttp__internal__n_error_109: {
       state->error = 0x9;
       state->reason = "Expected dot";
       state->error_pos = (const char*) p;
@@ -6686,8 +6686,8 @@ static llparse_state_t llhttp__internal__run(
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_109:
-    s_n_llhttp__internal__n_error_109: {
+    case s_n_llhttp__internal__n_error_110:
+    s_n_llhttp__internal__n_error_110: {
       state->error = 0x9;
       state->reason = "Invalid major version";
       state->error_pos = (const char*) p;
@@ -6778,7 +6778,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_span_start_llhttp__on_version_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_114;
+          goto s_n_llhttp__internal__n_error_115;
         }
       }
       UNREACHABLE;
@@ -6791,12 +6791,12 @@ static llparse_state_t llhttp__internal__run(
         case 21:
           goto s_n_llhttp__internal__n_pause_30;
         default:
-          goto s_n_llhttp__internal__n_error_113;
+          goto s_n_llhttp__internal__n_error_114;
       }
       UNREACHABLE;
     }
-    case s_n_llhttp__internal__n_error_115:
-    s_n_llhttp__internal__n_error_115: {
+    case s_n_llhttp__internal__n_error_116:
+    s_n_llhttp__internal__n_error_116: {
       state->error = 0x8;
       state->reason = "Expected HTTP/, RTSP/ or ICE/";
       state->error_pos = (const char*) p;
@@ -6938,7 +6938,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_req_or_res_method_2;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_110;
+          goto s_n_llhttp__internal__n_error_111;
         }
       }
       UNREACHABLE;
@@ -6969,7 +6969,7 @@ static llparse_state_t llhttp__internal__run(
           return s_n_llhttp__internal__n_req_or_res_method_3;
         }
         case kMatchMismatch: {
-          goto s_n_llhttp__internal__n_error_110;
+          goto s_n_llhttp__internal__n_error_111;
         }
       }
       UNREACHABLE;
@@ -6989,7 +6989,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_req_or_res_method_3;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_110;
+          goto s_n_llhttp__internal__n_error_111;
         }
       }
       UNREACHABLE;
@@ -7005,7 +7005,7 @@ static llparse_state_t llhttp__internal__run(
           goto s_n_llhttp__internal__n_req_or_res_method_1;
         }
         default: {
-          goto s_n_llhttp__internal__n_error_110;
+          goto s_n_llhttp__internal__n_error_111;
         }
       }
       UNREACHABLE;
@@ -8083,7 +8083,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_60: {
+  s_n_llhttp__internal__n_error_61: {
     state->error = 0xb;
     state->reason = "Content-Length can't be present with Transfer-Encoding";
     state->error_pos = (const char*) p;
@@ -8116,6 +8116,14 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
+  s_n_llhttp__internal__n_error_50: {
+    state->error = 0xf;
+    state->reason = "Empty Transfer-Encoding";
+    state->error_pos = (const char*) p;
+    state->_current = (void*) (intptr_t) s_error;
+    return s_error;
+    UNREACHABLE;
+  }
   s_n_llhttp__internal__n_pause_18: {
     state->error = 0x15;
     state->reason = "on_header_value_complete pause";
@@ -8202,6 +8210,8 @@ static llparse_state_t llhttp__internal__run(
     switch (llhttp__internal__c_load_header_state(state, p, endp)) {
       case 2:
         goto s_n_llhttp__internal__n_error_49;
+      case 3:
+        goto s_n_llhttp__internal__n_error_50;
       default:
         goto s_n_llhttp__internal__n_invoke_load_header_state_2;
     }
@@ -8224,7 +8234,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_50: {
+  s_n_llhttp__internal__n_error_51: {
     state->error = 0x2;
     state->reason = "Expected LF after CR";
     state->error_pos = (const char*) p;
@@ -8237,7 +8247,7 @@ static llparse_state_t llhttp__internal__run(
       case 1:
         goto s_n_llhttp__internal__n_header_value_discard_lws;
       default:
-        goto s_n_llhttp__internal__n_error_50;
+        goto s_n_llhttp__internal__n_error_51;
     }
     UNREACHABLE;
   }
@@ -8257,7 +8267,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_52: {
+  s_n_llhttp__internal__n_error_53: {
     state->error = 0xa;
     state->reason = "Unexpected whitespace after header value";
     state->error_pos = (const char*) p;
@@ -8270,7 +8280,7 @@ static llparse_state_t llhttp__internal__run(
       case 1:
         goto s_n_llhttp__internal__n_invoke_load_header_state_4;
       default:
-        goto s_n_llhttp__internal__n_error_52;
+        goto s_n_llhttp__internal__n_error_53;
     }
     UNREACHABLE;
   }
@@ -8324,7 +8334,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_53: {
+  s_n_llhttp__internal__n_error_54: {
     state->error = 0x3;
     state->reason = "Missing expected LF after header value";
     state->error_pos = (const char*) p;
@@ -8332,7 +8342,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_51: {
+  s_n_llhttp__internal__n_error_52: {
     state->error = 0x19;
     state->reason = "Missing expected CR after header value";
     state->error_pos = (const char*) p;
@@ -8416,10 +8426,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_54;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_55;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_54;
+    goto s_n_llhttp__internal__n_error_55;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_test_lenient_flags_20: {
@@ -8528,10 +8538,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_56;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_56;
+    goto s_n_llhttp__internal__n_error_57;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_mul_add_content_length_1: {
@@ -8560,13 +8570,13 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_57;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_58;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_57;
+    goto s_n_llhttp__internal__n_error_58;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_55: {
+  s_n_llhttp__internal__n_error_56: {
     state->error = 0x4;
     state->reason = "Duplicate Content-Length";
     state->error_pos = (const char*) p;
@@ -8579,7 +8589,7 @@ static llparse_state_t llhttp__internal__run(
       case 0:
         goto s_n_llhttp__internal__n_header_value_content_length;
       default:
-        goto s_n_llhttp__internal__n_error_55;
+        goto s_n_llhttp__internal__n_error_56;
     }
     UNREACHABLE;
   }
@@ -8593,11 +8603,11 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) (p + 1);
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_59;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_60;
       return s_error;
     }
     p++;
-    goto s_n_llhttp__internal__n_error_59;
+    goto s_n_llhttp__internal__n_error_60;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_update_header_state_8: {
@@ -8617,11 +8627,11 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) (p + 1);
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_58;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_59;
       return s_error;
     }
     p++;
-    goto s_n_llhttp__internal__n_error_58;
+    goto s_n_llhttp__internal__n_error_59;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_test_lenient_flags_21: {
@@ -8722,7 +8732,7 @@ static llparse_state_t llhttp__internal__run(
   s_n_llhttp__internal__n_invoke_test_lenient_flags_23: {
     switch (llhttp__internal__c_test_lenient_flags_23(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_error_60;
+        goto s_n_llhttp__internal__n_error_61;
       default:
         goto s_n_llhttp__internal__n_header_value_discard_ws;
     }
@@ -8737,7 +8747,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_61: {
+  s_n_llhttp__internal__n_error_62: {
     state->error = 0xf;
     state->reason = "Transfer-Encoding can't be present with Content-Length";
     state->error_pos = (const char*) p;
@@ -8748,7 +8758,7 @@ static llparse_state_t llhttp__internal__run(
   s_n_llhttp__internal__n_invoke_test_lenient_flags_24: {
     switch (llhttp__internal__c_test_lenient_flags_23(state, p, endp)) {
       case 0:
-        goto s_n_llhttp__internal__n_error_61;
+        goto s_n_llhttp__internal__n_error_62;
       default:
         goto s_n_llhttp__internal__n_header_value_discard_ws;
     }
@@ -8813,7 +8823,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_invoke_llhttp__on_header_field_complete;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_62: {
+  s_n_llhttp__internal__n_error_63: {
     state->error = 0xa;
     state->reason = "Invalid header token";
     state->error_pos = (const char*) p;
@@ -8916,7 +8926,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_url_skip_to_http09;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_63: {
+  s_n_llhttp__internal__n_error_64: {
     state->error = 0x7;
     state->reason = "Expected CRLF";
     state->error_pos = (const char*) p;
@@ -8940,7 +8950,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_url_skip_lf_to_http09;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_72: {
+  s_n_llhttp__internal__n_error_73: {
     state->error = 0x17;
     state->reason = "Pause on PRI/Upgrade";
     state->error_pos = (const char*) p;
@@ -8948,7 +8958,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_73: {
+  s_n_llhttp__internal__n_error_74: {
     state->error = 0x9;
     state->reason = "Expected HTTP/2 Connection Preface";
     state->error_pos = (const char*) p;
@@ -8956,7 +8966,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_70: {
+  s_n_llhttp__internal__n_error_71: {
     state->error = 0x2;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -8969,11 +8979,11 @@ static llparse_state_t llhttp__internal__run(
       case 1:
         goto s_n_llhttp__internal__n_headers_start;
       default:
-        goto s_n_llhttp__internal__n_error_70;
+        goto s_n_llhttp__internal__n_error_71;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_69: {
+  s_n_llhttp__internal__n_error_70: {
     state->error = 0x9;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -8986,11 +8996,11 @@ static llparse_state_t llhttp__internal__run(
       case 1:
         goto s_n_llhttp__internal__n_req_http_complete_crlf;
       default:
-        goto s_n_llhttp__internal__n_error_69;
+        goto s_n_llhttp__internal__n_error_70;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_71: {
+  s_n_llhttp__internal__n_error_72: {
     state->error = 0x9;
     state->reason = "Expected CRLF after version";
     state->error_pos = (const char*) p;
@@ -9006,7 +9016,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_68: {
+  s_n_llhttp__internal__n_error_69: {
     state->error = 0x21;
     state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9040,10 +9050,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_67;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_68;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_67;
+    goto s_n_llhttp__internal__n_error_68;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_load_http_minor: {
@@ -9114,10 +9124,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_74;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_75;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_74;
+    goto s_n_llhttp__internal__n_error_75;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_span_end_llhttp__on_version_3: {
@@ -9130,10 +9140,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_75;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_76;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_75;
+    goto s_n_llhttp__internal__n_error_76;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_store_http_major: {
@@ -9153,13 +9163,13 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_76;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_77;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_76;
+    goto s_n_llhttp__internal__n_error_77;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_77: {
+  s_n_llhttp__internal__n_error_78: {
     state->error = 0x8;
     state->reason = "Expected HTTP/, RTSP/ or ICE/";
     state->error_pos = (const char*) p;
@@ -9167,7 +9177,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_66: {
+  s_n_llhttp__internal__n_error_67: {
     state->error = 0x8;
     state->reason = "Invalid method for HTTP/x.x request";
     state->error_pos = (const char*) p;
@@ -9183,7 +9193,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_65: {
+  s_n_llhttp__internal__n_error_66: {
     state->error = 0x26;
     state->reason = "`on_protocol_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9217,13 +9227,13 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_82;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_83;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_82;
+    goto s_n_llhttp__internal__n_error_83;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_79: {
+  s_n_llhttp__internal__n_error_80: {
     state->error = 0x8;
     state->reason = "Expected SOURCE method for ICE/x.x request";
     state->error_pos = (const char*) p;
@@ -9239,7 +9249,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_78: {
+  s_n_llhttp__internal__n_error_79: {
     state->error = 0x26;
     state->reason = "`on_protocol_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9263,7 +9273,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_invoke_llhttp__on_protocol_complete_1;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_81: {
+  s_n_llhttp__internal__n_error_82: {
     state->error = 0x8;
     state->reason = "Invalid method for RTSP/x.x request";
     state->error_pos = (const char*) p;
@@ -9279,7 +9289,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_80: {
+  s_n_llhttp__internal__n_error_81: {
     state->error = 0x26;
     state->reason = "`on_protocol_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9311,7 +9321,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_64: {
+  s_n_llhttp__internal__n_error_65: {
     state->error = 0x1a;
     state->reason = "`on_url_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9326,7 +9336,7 @@ static llparse_state_t llhttp__internal__run(
       case 21:
         goto s_n_llhttp__internal__n_pause_25;
       default:
-        goto s_n_llhttp__internal__n_error_64;
+        goto s_n_llhttp__internal__n_error_65;
     }
     UNREACHABLE;
   }
@@ -9394,7 +9404,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_url_skip_to_http;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_83: {
+  s_n_llhttp__internal__n_error_84: {
     state->error = 0x7;
     state->reason = "Invalid char in url fragment start";
     state->error_pos = (const char*) p;
@@ -9450,7 +9460,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_url_skip_to_http;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_84: {
+  s_n_llhttp__internal__n_error_85: {
     state->error = 0x7;
     state->reason = "Invalid char in url query";
     state->error_pos = (const char*) p;
@@ -9458,7 +9468,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_85: {
+  s_n_llhttp__internal__n_error_86: {
     state->error = 0x7;
     state->reason = "Invalid char in url path";
     state->error_pos = (const char*) p;
@@ -9562,7 +9572,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_url_skip_to_http;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_86: {
+  s_n_llhttp__internal__n_error_87: {
     state->error = 0x7;
     state->reason = "Double @ in url";
     state->error_pos = (const char*) p;
@@ -9570,7 +9580,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_87: {
+  s_n_llhttp__internal__n_error_88: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -9578,7 +9588,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_88: {
+  s_n_llhttp__internal__n_error_89: {
     state->error = 0x7;
     state->reason = "Unexpected char in url server";
     state->error_pos = (const char*) p;
@@ -9586,7 +9596,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_89: {
+  s_n_llhttp__internal__n_error_90: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -9594,7 +9604,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_90: {
+  s_n_llhttp__internal__n_error_91: {
     state->error = 0x7;
     state->reason = "Unexpected char in url schema";
     state->error_pos = (const char*) p;
@@ -9602,7 +9612,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_91: {
+  s_n_llhttp__internal__n_error_92: {
     state->error = 0x7;
     state->reason = "Unexpected start char in url";
     state->error_pos = (const char*) p;
@@ -9619,7 +9629,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_92: {
+  s_n_llhttp__internal__n_error_93: {
     state->error = 0x6;
     state->reason = "Expected space after method";
     state->error_pos = (const char*) p;
@@ -9635,7 +9645,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_111: {
+  s_n_llhttp__internal__n_error_112: {
     state->error = 0x20;
     state->reason = "`on_method_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9666,7 +9676,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_112: {
+  s_n_llhttp__internal__n_error_113: {
     state->error = 0x6;
     state->reason = "Invalid method encountered";
     state->error_pos = (const char*) p;
@@ -9674,7 +9684,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_104: {
+  s_n_llhttp__internal__n_error_105: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9682,7 +9692,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_102: {
+  s_n_llhttp__internal__n_error_103: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9690,7 +9700,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_100: {
+  s_n_llhttp__internal__n_error_101: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9706,7 +9716,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_96: {
+  s_n_llhttp__internal__n_error_97: {
     state->error = 0x1b;
     state->reason = "`on_status_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9721,11 +9731,11 @@ static llparse_state_t llhttp__internal__run(
       case 21:
         goto s_n_llhttp__internal__n_pause_27;
       default:
-        goto s_n_llhttp__internal__n_error_96;
+        goto s_n_llhttp__internal__n_error_97;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_95: {
+  s_n_llhttp__internal__n_error_96: {
     state->error = 0xd;
     state->reason = "Invalid response status";
     state->error_pos = (const char*) p;
@@ -9738,11 +9748,11 @@ static llparse_state_t llhttp__internal__run(
       case 1:
         goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete;
       default:
-        goto s_n_llhttp__internal__n_error_95;
+        goto s_n_llhttp__internal__n_error_96;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_97: {
+  s_n_llhttp__internal__n_error_98: {
     state->error = 0x2;
     state->reason = "Expected LF after CR";
     state->error_pos = (const char*) p;
@@ -9755,11 +9765,11 @@ static llparse_state_t llhttp__internal__run(
       case 1:
         goto s_n_llhttp__internal__n_invoke_llhttp__on_status_complete;
       default:
-        goto s_n_llhttp__internal__n_error_97;
+        goto s_n_llhttp__internal__n_error_98;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_98: {
+  s_n_llhttp__internal__n_error_99: {
     state->error = 0x19;
     state->reason = "Missing expected CR after response line";
     state->error_pos = (const char*) p;
@@ -9801,7 +9811,7 @@ static llparse_state_t llhttp__internal__run(
     goto s_n_llhttp__internal__n_res_line_almost_done;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_99: {
+  s_n_llhttp__internal__n_error_100: {
     state->error = 0xd;
     state->reason = "Invalid response status";
     state->error_pos = (const char*) p;
@@ -9812,13 +9822,13 @@ static llparse_state_t llhttp__internal__run(
   s_n_llhttp__internal__n_invoke_mul_add_status_code_2: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_100;
+        goto s_n_llhttp__internal__n_error_101;
       default:
         goto s_n_llhttp__internal__n_res_status_code_otherwise;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_101: {
+  s_n_llhttp__internal__n_error_102: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9829,13 +9839,13 @@ static llparse_state_t llhttp__internal__run(
   s_n_llhttp__internal__n_invoke_mul_add_status_code_1: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_102;
+        goto s_n_llhttp__internal__n_error_103;
       default:
         goto s_n_llhttp__internal__n_res_status_code_digit_3;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_103: {
+  s_n_llhttp__internal__n_error_104: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9846,13 +9856,13 @@ static llparse_state_t llhttp__internal__run(
   s_n_llhttp__internal__n_invoke_mul_add_status_code: {
     switch (llhttp__internal__c_mul_add_status_code(state, p, endp, match)) {
       case 1:
-        goto s_n_llhttp__internal__n_error_104;
+        goto s_n_llhttp__internal__n_error_105;
       default:
         goto s_n_llhttp__internal__n_res_status_code_digit_2;
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_105: {
+  s_n_llhttp__internal__n_error_106: {
     state->error = 0xd;
     state->reason = "Invalid status code";
     state->error_pos = (const char*) p;
@@ -9867,7 +9877,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_106: {
+  s_n_llhttp__internal__n_error_107: {
     state->error = 0x9;
     state->reason = "Expected space after version";
     state->error_pos = (const char*) p;
@@ -9883,7 +9893,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_94: {
+  s_n_llhttp__internal__n_error_95: {
     state->error = 0x21;
     state->reason = "`on_version_complete` callback error";
     state->error_pos = (const char*) p;
@@ -9917,10 +9927,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_93;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_94;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_93;
+    goto s_n_llhttp__internal__n_error_94;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_load_http_minor_3: {
@@ -9991,10 +10001,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_107;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_108;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_107;
+    goto s_n_llhttp__internal__n_error_108;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_span_end_llhttp__on_version_8: {
@@ -10007,10 +10017,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_108;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_109;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_108;
+    goto s_n_llhttp__internal__n_error_109;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_invoke_store_http_major_1: {
@@ -10030,13 +10040,13 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_109;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_110;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_109;
+    goto s_n_llhttp__internal__n_error_110;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_114: {
+  s_n_llhttp__internal__n_error_115: {
     state->error = 0x8;
     state->reason = "Expected HTTP/, RTSP/ or ICE/";
     state->error_pos = (const char*) p;
@@ -10052,7 +10062,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_113: {
+  s_n_llhttp__internal__n_error_114: {
     state->error = 0x26;
     state->reason = "`on_protocol_complete` callback error";
     state->error_pos = (const char*) p;
@@ -10086,10 +10096,10 @@ static llparse_state_t llhttp__internal__run(
     if (err != 0) {
       state->error = err;
       state->error_pos = (const char*) p;
-      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_115;
+      state->_current = (void*) (intptr_t) s_n_llhttp__internal__n_error_116;
       return s_error;
     }
-    goto s_n_llhttp__internal__n_error_115;
+    goto s_n_llhttp__internal__n_error_116;
     UNREACHABLE;
   }
   s_n_llhttp__internal__n_pause_26: {
@@ -10138,7 +10148,7 @@ static llparse_state_t llhttp__internal__run(
     }
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_110: {
+  s_n_llhttp__internal__n_error_111: {
     state->error = 0x8;
     state->reason = "Invalid word encountered";
     state->error_pos = (const char*) p;
@@ -10204,7 +10214,7 @@ static llparse_state_t llhttp__internal__run(
     return s_error;
     UNREACHABLE;
   }
-  s_n_llhttp__internal__n_error_116: {
+  s_n_llhttp__internal__n_error_117: {
     state->error = 0x1f;
     state->reason = "`on_reset` callback error";
     state->error_pos = (const char*) p;
@@ -10219,7 +10229,7 @@ static llparse_state_t llhttp__internal__run(
       case 21:
         goto s_n_llhttp__internal__n_pause_32;
       default:
-        goto s_n_llhttp__internal__n_error_116;
+        goto s_n_llhttp__internal__n_error_117;
     }
     UNREACHABLE;
   }
diff --git a/deps/undici/src/lib/core/request.js b/deps/undici/src/lib/core/request.js
index 4da60667ec2..8e7ecc73084 100644
--- a/deps/undici/src/lib/core/request.js
+++ b/deps/undici/src/lib/core/request.js
@@ -350,7 +350,13 @@ function processHeader (request, key, val) {
       } else if (typeof val[i] === 'object') {
         throw new InvalidArgumentError(`invalid ${key} header`)
       } else {
-        arr.push(`${val[i]}`)
+        // Coerce primitives (and reject unsafe coercions such as functions
+        // with a crafted toString/Symbol.toPrimitive).
+        const str = `${val[i]}`
+        if (!isValidHeaderValue(str)) {
+          throw new InvalidArgumentError(`invalid ${key} header`)
+        }
+        arr.push(str)
       }
     }
     val = arr
@@ -361,7 +367,12 @@ function processHeader (request, key, val) {
   } else if (val === null) {
     val = ''
   } else {
+    // Coerce primitives (and reject unsafe coercions such as functions
+    // with a crafted toString/Symbol.toPrimitive).
     val = `${val}`
+    if (!isValidHeaderValue(val)) {
+      throw new InvalidArgumentError(`invalid ${key} header`)
+    }
   }
 
   if (headerName === 'host') {
diff --git a/deps/undici/src/lib/dispatcher/client-h1.js b/deps/undici/src/lib/dispatcher/client-h1.js
index 9455517a19b..a801ecb3604 100644
--- a/deps/undici/src/lib/dispatcher/client-h1.js
+++ b/deps/undici/src/lib/dispatcher/client-h1.js
@@ -10,6 +10,7 @@ const {
   RequestContentLengthMismatchError,
   ResponseContentLengthMismatchError,
   RequestAbortedError,
+  InvalidArgumentError,
   HeadersTimeoutError,
   HeadersOverflowError,
   SocketError,
@@ -993,8 +994,16 @@ function writeH1 (client, request) {
     }
     body = bodyStream.stream
     contentLength = bodyStream.length
-  } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-    headers.push('content-type', body.type)
+  } else if (util.isBlobLike(body) && request.contentType == null) {
+    const contentType = body.type
+    if (contentType) {
+      const contentTypeValue = `${contentType}`
+      if (!util.isValidHeaderValue(contentTypeValue)) {
+        util.errorRequest(client, request, new InvalidArgumentError('invalid content-type header'))
+        return false
+      }
+      headers.push('content-type', contentTypeValue)
+    }
   }
 
   if (body && typeof body.read === 'function') {
diff --git a/deps/undici/src/lib/handler/retry-handler.js b/deps/undici/src/lib/handler/retry-handler.js
index 5d1ccf00538..c62a2409f3a 100644
--- a/deps/undici/src/lib/handler/retry-handler.js
+++ b/deps/undici/src/lib/handler/retry-handler.js
@@ -15,6 +15,28 @@ function calculateRetryAfterHeader (retryAfter) {
   return new Date(retryAfter).getTime() - current
 }
 
+function validatePartialResponseContentLength (headers, range, statusCode, retryCount) {
+  const contentLength = headers['content-length']
+  if (contentLength == null) {
+    return null
+  }
+
+  if (!Number.isFinite(range.start) || !Number.isFinite(range.end)) {
+    return null
+  }
+
+  const length = Number(contentLength)
+  const expectedLength = range.end - range.start + 1
+  if (!Number.isFinite(length) || length !== expectedLength) {
+    return new RequestRetryError('Content-Length mismatch', statusCode, {
+      headers,
+      data: { count: retryCount }
+    })
+  }
+
+  return null
+}
+
 class RetryHandler {
   constructor (opts, handlers) {
     const { retryOptions, ...dispatchOpts } = opts
@@ -229,6 +251,12 @@ class RetryHandler {
         return false
       }
 
+      const contentLengthError = validatePartialResponseContentLength(headers, contentRange, statusCode, this.retryCount)
+      if (contentLengthError != null) {
+        this.abort(contentLengthError)
+        return false
+      }
+
       const { start, size, end = size - 1 } = contentRange
 
       assert(this.start === start, 'content-range mismatch')
@@ -252,6 +280,12 @@ class RetryHandler {
           )
         }
 
+        const contentLengthError = validatePartialResponseContentLength(headers, range, statusCode, this.retryCount)
+        if (contentLengthError != null) {
+          this.abort(contentLengthError)
+          return false
+        }
+
         const { start, size, end = size - 1 } = range
         assert(
           start != null && Number.isFinite(start),
diff --git a/deps/undici/src/lib/llhttp/wasm_build_env.txt b/deps/undici/src/lib/llhttp/wasm_build_env.txt
index f8ac034d6e1..eb2202707a5 100644
--- a/deps/undici/src/lib/llhttp/wasm_build_env.txt
+++ b/deps/undici/src/lib/llhttp/wasm_build_env.txt
@@ -1,12 +1,12 @@
 
-> undici@6.27.0 prebuild:wasm
+> undici@6.28.0 prebuild:wasm
 > node build/wasm.js --prebuild
 
 > docker build --platform=linux/x86_64 -t llhttp_wasm_builder -f /home/runner/work/node/node/deps/undici/src/build/Dockerfile /home/runner/work/node/node/deps/undici/src
 
 
 
-> undici@6.27.0 build:wasm
+> undici@6.28.0 build:wasm
 > node build/wasm.js --docker
 
 > docker run --rm -t --platform=linux/x86_64 --user 1001:1001 --mount type=bind,source=/home/runner/work/node/node/deps/undici/src/lib/llhttp,target=/home/node/undici/lib/llhttp llhttp_wasm_builder node build/wasm.js
diff --git a/deps/undici/src/lib/web/cookies/util.js b/deps/undici/src/lib/web/cookies/util.js
index 254f5419e90..ca408e153ab 100644
--- a/deps/undici/src/lib/web/cookies/util.js
+++ b/deps/undici/src/lib/web/cookies/util.js
@@ -105,7 +105,7 @@ function validateCookiePath (path) {
 
     if (
       code < 0x20 || // exclude CTLs (0-31)
-      code === 0x7F || // DEL
+      code > 0x7E || // exclude DEL and non-ascii
       code === 0x3B // ;
     ) {
       throw new Error('Invalid cookie path')
@@ -114,16 +114,80 @@ function validateCookiePath (path) {
 }
 
 /**
- * I have no idea why these values aren't allowed to be honest,
- * but Deno tests these. - Khafra
+ * <let-dig> ::= <letter> | <digit>
+ *
+ * <letter> ::= any one of the 52 alphabetic characters A through Z in
+ * upper case and a through z in lower case
+ *
+ * <digit> ::= any one of the ten digits 0 through 9r
+ *
+ * @see https://www.rfc-editor.org/rfc/rfc1034#section-3.5
+ * @param {number} code
+ */
+function isLetterOrDigit (code) {
+  return (
+    (code >= 0x30 && code <= 0x39) || // 0-9
+    (code >= 0x41 && code <= 0x5A) || // A-Z
+    (code >= 0x61 && code <= 0x7A) // a-z
+  )
+}
+
+/**
+ * Validates a cookie domain against the "preferred name syntax".
+ *
+ * <domain>      ::= <subdomain> | " "
+ * <subdomain>   ::= <label> | <subdomain> "." <label>
+ * <label>       ::= <let-dig> [ [ <ldh-str> ] <let-dig> ]
+ * <ldh-str>     ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
+ * <let-dig-hyp> ::= <let-dig> | "-"
+ *
+ * @see https://www.rfc-editor.org/rfc/rfc1034#section-3.5
+ * @see https://www.rfc-editor.org/rfc/rfc1123#section-2.1
+ * @see https://www.rfc-editor.org/rfc/rfc1035#section-2.3.4
  * @param {string} domain
  */
 function validateCookieDomain (domain) {
-  if (
-    domain.startsWith('-') ||
-    domain.endsWith('.') ||
-    domain.endsWith('-')
-  ) {
+  // <domain> ::= <subdomain> | " "
+  if (domain === ' ') {
+    return
+  }
+
+  if (domain.length > 255) {
+    throw new Error('Invalid cookie domain')
+  }
+
+  let labelLength = 0
+
+  for (let i = 0; i < domain.length; ++i) {
+    const code = domain.charCodeAt(i)
+
+    if (code === 0x2E) {
+      if (labelLength === 0) {
+        throw new Error('Invalid cookie domain')
+      }
+
+      if (domain.charCodeAt(i - 1) === 0x2D) { // "-"
+        throw new Error('Invalid cookie domain')
+      }
+
+      labelLength = 0
+      continue
+    }
+
+    if (labelLength === 0 && !isLetterOrDigit(code)) {
+      throw new Error('Invalid cookie domain')
+    }
+
+    if (!isLetterOrDigit(code) && code !== 0x2D) { // "-"
+      throw new Error('Invalid cookie domain')
+    }
+
+    if (++labelLength > 63) {
+      throw new Error('Invalid cookie domain')
+    }
+  }
+
+  if (labelLength === 0 || domain.charCodeAt(domain.length - 1) === 0x2D) { // "-"
     throw new Error('Invalid cookie domain')
   }
 }
@@ -266,7 +330,13 @@ function stringify (cookie) {
 
     const [key, ...value] = part.split('=')
 
-    out.push(`${key.trim()}=${value.join('=')}`)
+    const trimmedKey = key.trim()
+    const joinedValue = value.join('=')
+
+    validateCookieName(trimmedKey)
+    validateCookieValue(joinedValue)
+
+    out.push(`${trimmedKey}=${joinedValue}`)
   }
 
   return out.join('; ')
diff --git a/deps/undici/src/package.json b/deps/undici/src/package.json
index 3c2001f391e..cd46deca244 100644
--- a/deps/undici/src/package.json
+++ b/deps/undici/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "undici",
-  "version": "6.27.0",
+  "version": "6.28.0",
   "description": "An HTTP/1.1 client, written from scratch for Node.js",
   "homepage": "https://undici.nodejs.org",
   "bugs": {
diff --git a/deps/undici/undici.js b/deps/undici/undici.js
index b9a26ad6264..08c8d112da1 100644
--- a/deps/undici/undici.js
+++ b/deps/undici/undici.js
@@ -2286,7 +2286,11 @@ var require_request = __commonJS({
           } else if (typeof val[i] === "object") {
             throw new InvalidArgumentError(`invalid ${key} header`);
           } else {
-            arr.push(`${val[i]}`);
+            const str = `${val[i]}`;
+            if (!isValidHeaderValue(str)) {
+              throw new InvalidArgumentError(`invalid ${key} header`);
+            }
+            arr.push(str);
           }
         }
         val = arr;
@@ -2298,6 +2302,9 @@ var require_request = __commonJS({
         val = "";
       } else {
         val = `${val}`;
+        if (!isValidHeaderValue(val)) {
+          throw new InvalidArgumentError(`invalid ${key} header`);
+        }
       }
       if (headerName === "host") {
         if (request.host !== null) {
@@ -5927,6 +5934,7 @@ var require_client_h1 = __commonJS({
       RequestContentLengthMismatchError,
       ResponseContentLengthMismatchError,
       RequestAbortedError,
+      InvalidArgumentError,
       HeadersTimeoutError,
       HeadersOverflowError,
       SocketError,
@@ -6663,8 +6671,16 @@ var require_client_h1 = __commonJS({
         }
         body = bodyStream.stream;
         contentLength = bodyStream.length;
-      } else if (util.isBlobLike(body) && request.contentType == null && body.type) {
-        headers.push("content-type", body.type);
+      } else if (util.isBlobLike(body) && request.contentType == null) {
+        const contentType = body.type;
+        if (contentType) {
+          const contentTypeValue = `${contentType}`;
+          if (!util.isValidHeaderValue(contentTypeValue)) {
+            util.errorRequest(client, request, new InvalidArgumentError("invalid content-type header"));
+            return false;
+          }
+          headers.push("content-type", contentTypeValue);
+        }
       }
       if (body && typeof body.read === "function") {
         body.read(0);
diff --git a/doc/api/http2.md b/doc/api/http2.md
index 2180d0f70e6..539979aa6d1 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -2845,9 +2845,10 @@ changes:
     This is a credit based limit, existing `Http2Stream`s may cause this
     limit to be exceeded, but new `Http2Stream` instances will be rejected
     while this limit is exceeded. The current number of `Http2Stream` sessions,
-    the current memory use of the header compression tables, current data
-    queued to be sent, and unacknowledged `PING` and `SETTINGS` frames are all
-    counted towards the current limit. **Default:** `10`.
+    the current memory use of the header compression tables, header blocks
+    retained by open streams, current data queued to be sent, and
+    unacknowledged `PING` and `SETTINGS` frames are all counted towards the
+    current limit. **Default:** `10`.
   * `maxHeaderListPairs` {number} Sets the maximum number of header entries.
     This is similar to [`server.maxHeadersCount`][] or
     [`request.maxHeadersCount`][] in the `node:http` module. The minimum value
@@ -3034,9 +3035,10 @@ changes:
     credit based limit, existing `Http2Stream`s may cause this
     limit to be exceeded, but new `Http2Stream` instances will be rejected
     while this limit is exceeded. The current number of `Http2Stream` sessions,
-    the current memory use of the header compression tables, current data
-    queued to be sent, and unacknowledged `PING` and `SETTINGS` frames are all
-    counted towards the current limit. **Default:** `10`.
+    the current memory use of the header compression tables, header blocks
+    retained by open streams, current data queued to be sent, and
+    unacknowledged `PING` and `SETTINGS` frames are all counted towards the
+    current limit. **Default:** `10`.
   * `maxHeaderListPairs` {number} Sets the maximum number of header entries.
     This is similar to [`server.maxHeadersCount`][] or
     [`request.maxHeadersCount`][] in the `node:http` module. The minimum value
@@ -3196,9 +3198,10 @@ changes:
     This is a credit based limit, existing `Http2Stream`s may cause this
     limit to be exceeded, but new `Http2Stream` instances will be rejected
     while this limit is exceeded. The current number of `Http2Stream` sessions,
-    the current memory use of the header compression tables, current data
-    queued to be sent, and unacknowledged `PING` and `SETTINGS` frames are all
-    counted towards the current limit. **Default:** `10`.
+    the current memory use of the header compression tables, header blocks
+    retained by open streams, current data queued to be sent, and
+    unacknowledged `PING` and `SETTINGS` frames are all counted towards the
+    current limit. **Default:** `10`.
   * `maxHeaderListPairs` {number} Sets the maximum number of header entries.
     This is similar to [`server.maxHeadersCount`][] or
     [`request.maxHeadersCount`][] in the `node:http` module. The minimum value
diff --git a/doc/api/https.md b/doc/api/https.md
index b97e08cd5bd..fa5c084b318 100644
--- a/doc/api/https.md
+++ b/doc/api/https.md
@@ -98,6 +98,10 @@ changes:
 
     See [`Session Resumption`][] for information about TLS session reuse.
 
+Requests that specify a custom `checkServerIdentity` option are not eligible
+for connection reuse or TLS session reuse by an `https.Agent`, unless the
+`checkServerIdentity` option was specified when constructing the Agent.
+
 #### Event: `'keylog'`
 
 <!-- YAML
diff --git a/doc/changelogs/CHANGELOG_V22.md b/doc/changelogs/CHANGELOG_V22.md
index 986a302c1b0..0e9f80e98d8 100644
--- a/doc/changelogs/CHANGELOG_V22.md
+++ b/doc/changelogs/CHANGELOG_V22.md
@@ -9,6 +9,7 @@
 </tr>
 <tr>
 <td>
+<a href="#22.23.2">22.23.2</a><br/>
 <a href="#22.23.1">22.23.1</a><br/>
 <a href="#22.23.0">22.23.0</a><br/>
 <a href="#22.22.3">22.22.3</a><br/>
@@ -73,6 +74,42 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="22.23.2"></a>
+
+## 2026-07-29, Version 22.23.2 'Jod' (LTS), @marco-ippolito
+
+This is a security release.
+
+### Notable Changes
+
+* (CVE-2026-56846) http2: retain header memory in session accounting (Matteo Collina) – High
+* (CVE-2026-56848) http2: defer rst stream while in scope (Matteo Collina) – High
+* (CVE-2026-58043) permission: avoid granting radix split nodes (RafaelGSS) – High
+* (CVE-2026-56850) https: distinguish PFX object-array agent keys (RafaelGSS) – Medium
+* (CVE-2026-58040) https: bind identity checks to session reuse (Matteo Collina) – Medium
+* (CVE-2026-58042) dns: handle large resolveAny address replies (RafaelGSS) – Medium
+* (CVE-2026-58045) zlib: throw on out-of-bounds write buffers (RafaelGSS) – Medium
+* (CVE-2026-56847) permission: enforce fs write permission for trace events (RafaelGSS) – Low
+* (CVE-2026-58039) permission: check final report output path (RafaelGSS) – Low
+* (CVE-2026-58044) http: reject requests exceeding max header count (Matteo Collina) – Low
+* deps: update llhttp to 9.4.3 (Paolo Insogna)
+* deps: update undici to 6.28.0 (Node.js GitHub Bot)
+
+### Commits
+
+* \[[`4b12ac38a1`](https://github.com/nodejs/node/commit/4b12ac38a1)] - **deps**: update llhttp to 9.4.3 (Paolo Insogna) [nodejs-private/node-private#935](https://github.com/nodejs-private/node-private/pull/935)
+* \[[`3fd0aa51d0`](https://github.com/nodejs/node/commit/3fd0aa51d0)] - **deps**: update undici to 6.28.0 (Node.js GitHub Bot) [#64714](https://github.com/nodejs/node/pull/64714)
+* \[[`22efc051a3`](https://github.com/nodejs/node/commit/22efc051a3)] - **(CVE-2026-58042)** **dns**: handle large resolveAny address replies (RafaelGSS) [nodejs-private/node-private#929](https://github.com/nodejs-private/node-private/pull/929)
+* \[[`c8525ac3a6`](https://github.com/nodejs/node/commit/c8525ac3a6)] - **(CVE-2026-58044)** **http**: reject requests exceeding max header count (Matteo Collina) [nodejs-private/node-private#932](https://github.com/nodejs-private/node-private/pull/932)
+* \[[`daa6d25e3d`](https://github.com/nodejs/node/commit/daa6d25e3d)] - **(CVE-2026-56848)** **http2**: defer rst stream while in scope (Matteo Collina) [nodejs-private/node-private#921](https://github.com/nodejs-private/node-private/pull/921)
+* \[[`f14d78b9e0`](https://github.com/nodejs/node/commit/f14d78b9e0)] - **(CVE-2026-56846)** **http2**: retain header memory in session accounting (Matteo Collina) [#63752](https://github.com/nodejs/node/pull/63752)
+* \[[`51123159fe`](https://github.com/nodejs/node/commit/51123159fe)] - **(CVE-2026-58040)** **https**: bind identity checks to session reuse (Matteo Collina) [nodejs-private/node-private#934](https://github.com/nodejs-private/node-private/pull/934)
+* \[[`acaf4266b2`](https://github.com/nodejs/node/commit/acaf4266b2)] - **(CVE-2026-56850)** **https**: distinguish PFX object-array agent keys (RafaelGSS) [nodejs-private/node-private#930](https://github.com/nodejs-private/node-private/pull/930)
+* \[[`440329f624`](https://github.com/nodejs/node/commit/440329f624)] - **(CVE-2026-58043)** **permission**: avoid granting radix split nodes (RafaelGSS) [nodejs-private/node-private#911](https://github.com/nodejs-private/node-private/pull/911)
+* \[[`ed18b9cc07`](https://github.com/nodejs/node/commit/ed18b9cc07)] - **(CVE-2026-58039)** **permission**: check final report output path (RafaelGSS) [nodejs-private/node-private#926](https://github.com/nodejs-private/node-private/pull/926)
+* \[[`0566c3cccd`](https://github.com/nodejs/node/commit/0566c3cccd)] - **(CVE-2026-56847)** **permission**: enforce fs write permission for trace events (RafaelGSS) [nodejs-private/node-private#927](https://github.com/nodejs-private/node-private/pull/927)
+* \[[`0d072480c3`](https://github.com/nodejs/node/commit/0d072480c3)] - **(CVE-2026-58045)** **zlib**: throw on out-of-bounds write buffers (RafaelGSS) [nodejs-private/node-private#931](https://github.com/nodejs-private/node-private/pull/931)
+
 <a id="22.23.1"></a>
 
 ## 2026-06-23, Version 22.23.1 'Jod' (LTS), @RafaelGSS
diff --git a/doc/changelogs/NSOLID_CHANGELOG_V6_NODE_V22.md b/doc/changelogs/NSOLID_CHANGELOG_V6_NODE_V22.md
index da15ad910cd..a69086be603 100644
--- a/doc/changelogs/NSOLID_CHANGELOG_V6_NODE_V22.md
+++ b/doc/changelogs/NSOLID_CHANGELOG_V6_NODE_V22.md
@@ -2,6 +2,12 @@
 
 <!--lint disable maximum-line-length no-literal-urls prohibited-strings-->
 
+## 2026-07-29, Version 22.23.2-nsolid-v6.3.4 'Jod'
+
+### Commits
+
+* \[[`aa3a2bc8b0`](https://github.com/nodesource/nsolid/commit/aa3a2bc8b0)] - Merge tag 'v22.23.2' into node-v22.23.2-nsolid-v6.3.4-release (Santiago Gimeno)
+
 ## 2026-07-22, Version 22.23.1-nsolid-v6.3.3 'Jod'
 
 ### Commits
diff --git a/lib/https.js b/lib/https.js
index 015c05b2693..44cb8e87003 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -22,6 +22,7 @@
 'use strict';
 
 const {
+  ArrayIsArray,
   ArrayPrototypeIndexOf,
   ArrayPrototypePush,
   ArrayPrototypeShift,
@@ -34,6 +35,7 @@ const {
   ObjectSetPrototypeOf,
   ReflectApply,
   ReflectConstruct,
+  Symbol,
 } = primordials;
 
 const {
@@ -47,6 +49,8 @@ const { ERR_PROXY_TUNNEL } = require('internal/errors').codes;
 assertCrypto();
 
 const tls = require('tls');
+const kPerRequestCheckServerIdentity = Symbol('per-request checkServerIdentity');
+let perRequestCheckServerIdentityIndex = 0;
 const {
   kProxyConfig,
   checkShouldUseProxy,
@@ -276,6 +280,8 @@ function establishTunnel(agent, socket, options, tunnelConfig, afterSocket) {
         tunneldSocket.removeListener('error', onTLSHandshakeError);
         afterSocket(null, tunneldSocket);
       });
+      if (requestOptions[kPerRequestCheckServerIdentity])
+        tunneldSocket[kPerRequestCheckServerIdentity] = true;
       tunneldSocket.on('free', () => {
         debug('Propagate free event from tunneled socket to tunnel socket');
         socket.emit('free');
@@ -344,7 +350,9 @@ function createConnection(...args) {
 
   debug('createConnection', options);
 
-  if (options._agentKey) {
+  const reuseSession = options._agentKey &&
+                       !options[kPerRequestCheckServerIdentity];
+  if (reuseSession) {
     const session = this._getSession(options._agentKey);
     if (session) {
       debug('reuse session for %j', options._agentKey);
@@ -411,7 +419,10 @@ function createConnection(...args) {
     socket[kWaitForProxyTunnel] = true;
   }
 
-  if (options._agentKey) {
+  if (options[kPerRequestCheckServerIdentity])
+    socket[kPerRequestCheckServerIdentity] = true;
+
+  if (reuseSession) {
     // Cache new session for reuse
     socket.on('session', (session) => {
       this._cacheSession(options._agentKey, session);
@@ -466,6 +477,26 @@ function Agent(options) {
 ObjectSetPrototypeOf(Agent.prototype, HttpAgent.prototype);
 ObjectSetPrototypeOf(Agent, HttpAgent);
 Agent.prototype.createConnection = createConnection;
+Agent.prototype.keepSocketAlive = function keepSocketAlive(socket) {
+  if (socket[kPerRequestCheckServerIdentity])
+    return false;
+
+  return FunctionPrototypeCall(HttpAgent.prototype.keepSocketAlive, this, socket);
+};
+
+function getPfxAgentKey(pfx, passphrase) {
+  if (!ArrayIsArray(pfx))
+    return pfx;
+
+  let key = '';
+  for (let i = 0; i < pfx.length; i++) {
+    const value = pfx[i];
+    const raw = value?.buf || value;
+    const pass = value?.passphrase || passphrase;
+    key += `:${raw}:${pass}`;
+  }
+  return key;
+}
 
 /**
  * Gets a unique name for a set of options.
@@ -502,7 +533,7 @@ Agent.prototype.getName = function getName(options = kEmptyObject) {
 
   name += ':';
   if (options.pfx)
-    name += options.pfx;
+    name += getPfxAgentKey(options.pfx, options.passphrase);
 
   name += ':';
   if (options.rejectUnauthorized !== undefined)
@@ -560,6 +591,9 @@ Agent.prototype.getName = function getName(options = kEmptyObject) {
   if (options.privateKeyEngine)
     name += options.privateKeyEngine;
 
+  if (options[kPerRequestCheckServerIdentity])
+    name += `:${options[kPerRequestCheckServerIdentity]}`;
+
   return name;
 };
 
@@ -604,6 +638,20 @@ const globalAgent = new Agent({
   proxyEnv: getOptionValue('--use-env-proxy') ? filterEnvForProxies(process.env) : undefined,
 });
 
+function hasAgentCheckServerIdentity(options) {
+  let { agent } = options;
+  if (agent === false)
+    return false;
+
+  if (agent === null || agent === undefined) {
+    if (typeof options.createConnection === 'function')
+      return false;
+    agent = module.exports.globalAgent;
+  }
+
+  return agent?.options?.checkServerIdentity !== undefined;
+}
+
 /**
  * Makes a request to a secure web server.
  * @param {...any} args
@@ -623,6 +671,13 @@ function request(...args) {
     ObjectAssign(options, ArrayPrototypeShift(args));
   }
 
+  if (options.checkServerIdentity !== undefined &&
+      options.checkServerIdentity !== tls.checkServerIdentity &&
+      !hasAgentCheckServerIdentity(options)) {
+    options[kPerRequestCheckServerIdentity] =
+      ++perRequestCheckServerIdentityIndex;
+  }
+
   options._defaultAgent = module.exports.globalAgent;
   ArrayPrototypeUnshift(args, options);
 
diff --git a/lib/internal/process/report.js b/lib/internal/process/report.js
index 7b34af0e289..c383dc8caeb 100644
--- a/lib/internal/process/report.js
+++ b/lib/internal/process/report.js
@@ -9,6 +9,7 @@ const {
   ERR_SYNTHETIC,
 } = require('internal/errors').codes;
 const { getValidatedPath } = require('internal/fs/utils');
+const { sep } = require('path');
 const permission = require('internal/process/permission');
 const {
   validateBoolean,
@@ -29,7 +30,14 @@ const report = {
     }
 
     if (permission.isEnabled()) {
-      const resource = file ?? process.cwd();
+      let resource = file;
+      if (resource !== undefined) {
+        const directory = nr.getDirectory();
+        if (directory !== '')
+          resource = `${directory}${sep}${resource}`;
+      } else {
+        resource = process.cwd();
+      }
       if (!permission.has('fs.write', resource)) {
         throw new ERR_ACCESS_DENIED(
           'Access to this API has been restricted',
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 31705cd1e02..c94c357d98b 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -207,6 +207,23 @@ Local<Array> AddrTTLToArray(
   return Array::New(env->isolate(), ttls.out(), naddrttls);
 }
 
+int GetAnswerCountForTTLBuffer(const unsigned char* buf, int len) {
+  static constexpr int kDNSAnswerCountOffset = 6;
+  static constexpr int kAresDefaultTTLBufferLength = 256;
+  if (len <= kDNSAnswerCountOffset + 1) {
+    return kAresDefaultTTLBufferLength;
+  }
+
+  const int answer_count = (static_cast<int>(buf[kDNSAnswerCountOffset]) << 8) |
+                           static_cast<int>(buf[kDNSAnswerCountOffset + 1]);
+  return answer_count == 0 ? 1 : answer_count;
+}
+
+template <typename T>
+std::vector<T> MakeAddrTTLBuffer(const unsigned char* buf, int len) {
+  return std::vector<T>(GetAnswerCountForTTLBuffer(buf, len));
+}
+
 Maybe<int> ParseGeneralReply(Environment* env,
                              const unsigned char* buf,
                              int len,
@@ -1068,11 +1085,12 @@ Maybe<int> AnyTraits::Parse(QueryAnyWrap* wrap,
   int type, status, old_count;
 
   /* Parse A records or CNAME records */
-  ares_addrttl addrttls[256];
-  int naddrttls = arraysize(addrttls);
+  std::vector<ares_addrttl> addrttls =
+      MakeAddrTTLBuffer<ares_addrttl>(buf, len);
+  int naddrttls = static_cast<int>(addrttls.size());
 
   type = ns_t_cname_or_a;
-  if (!ParseGeneralReply(env, buf, len, &type, ret, addrttls, &naddrttls)
+  if (!ParseGeneralReply(env, buf, len, &type, ret, addrttls.data(), &naddrttls)
            .To(&status)) {
     return Nothing<int>();
   }
@@ -1114,11 +1132,13 @@ Maybe<int> AnyTraits::Parse(QueryAnyWrap* wrap,
   }
 
   /* Parse AAAA records */
-  ares_addr6ttl addr6ttls[256];
-  int naddr6ttls = arraysize(addr6ttls);
+  std::vector<ares_addr6ttl> addr6ttls =
+      MakeAddrTTLBuffer<ares_addr6ttl>(buf, len);
+  int naddr6ttls = static_cast<int>(addr6ttls.size());
 
   type = ns_t_aaaa;
-  if (!ParseGeneralReply(env, buf, len, &type, ret, addr6ttls, &naddr6ttls)
+  if (!ParseGeneralReply(
+           env, buf, len, &type, ret, addr6ttls.data(), &naddr6ttls)
            .To(&status)) {
     return Nothing<int>();
   }
@@ -1270,12 +1290,13 @@ Maybe<int> ATraits::Parse(QueryAWrap* wrap,
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
 
-  ares_addrttl addrttls[256];
-  int naddrttls = arraysize(addrttls), status;
+  std::vector<ares_addrttl> addrttls =
+      MakeAddrTTLBuffer<ares_addrttl>(buf, len);
+  int naddrttls = static_cast<int>(addrttls.size()), status;
   Local<Array> ret = Array::New(env->isolate());
 
   int type = ns_t_a;
-  if (!ParseGeneralReply(env, buf, len, &type, ret, addrttls, &naddrttls)
+  if (!ParseGeneralReply(env, buf, len, &type, ret, addrttls.data(), &naddrttls)
            .To(&status)) {
     return Nothing<int>();
   }
@@ -1283,7 +1304,8 @@ Maybe<int> ATraits::Parse(QueryAWrap* wrap,
     return Just<int>(status);
   }
 
-  Local<Array> ttls = AddrTTLToArray<ares_addrttl>(env, addrttls, naddrttls);
+  Local<Array> ttls =
+      AddrTTLToArray<ares_addrttl>(env, addrttls.data(), naddrttls);
 
   wrap->CallOnComplete(ret, ttls);
   return Just<int>(ARES_SUCCESS);
@@ -1302,12 +1324,13 @@ Maybe<int> AaaaTraits::Parse(QueryAaaaWrap* wrap,
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
 
-  ares_addr6ttl addrttls[256];
-  int naddrttls = arraysize(addrttls), status;
+  std::vector<ares_addr6ttl> addrttls =
+      MakeAddrTTLBuffer<ares_addr6ttl>(buf, len);
+  int naddrttls = static_cast<int>(addrttls.size()), status;
   Local<Array> ret = Array::New(env->isolate());
 
   int type = ns_t_aaaa;
-  if (!ParseGeneralReply(env, buf, len, &type, ret, addrttls, &naddrttls)
+  if (!ParseGeneralReply(env, buf, len, &type, ret, addrttls.data(), &naddrttls)
            .To(&status)) {
     return Nothing<int>();
   }
@@ -1315,7 +1338,8 @@ Maybe<int> AaaaTraits::Parse(QueryAaaaWrap* wrap,
     return Just<int>(status);
   }
 
-  Local<Array> ttls = AddrTTLToArray<ares_addr6ttl>(env, addrttls, naddrttls);
+  Local<Array> ttls =
+      AddrTTLToArray<ares_addr6ttl>(env, addrttls.data(), naddrttls);
 
   wrap->CallOnComplete(ret, ttls);
   return Just<int>(ARES_SUCCESS);
diff --git a/src/node_http2.cc b/src/node_http2.cc
index 403d9982ebd..38ba01587a2 100644
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -907,6 +907,14 @@ BaseObjectPtr<Http2Stream> Http2Session::RemoveStream(int32_t id) {
   stream = FindStream(id);
   if (stream) {
     streams_.erase(id);
+    if (stream->current_headers_length_ > 0) {
+      DecrementCurrentSessionMemory(stream->current_headers_length_);
+      stream->current_headers_length_ = 0;
+    }
+    if (stream->retained_headers_length_ > 0) {
+      DecrementCurrentSessionMemory(stream->retained_headers_length_);
+      stream->retained_headers_length_ = 0;
+    }
     DecrementCurrentSessionMemory(sizeof(*stream));
   }
   return stream;
@@ -1553,7 +1561,10 @@ void Http2Session::HandleHeadersFrame(const nghttp2_frame* frame) {
   });
   CHECK_EQ(stream->headers_count(), 0);
 
-  DecrementCurrentSessionMemory(stream->current_headers_length_);
+  // Keep the header block charged against maxSessionMemory while the
+  // corresponding JS objects can still keep it alive for the lifetime of
+  // the stream.
+  stream->retained_headers_length_ += stream->current_headers_length_;
   stream->current_headers_length_ = 0;
 
   Local<Value> args[] = {
@@ -2523,10 +2534,18 @@ void Http2Stream::SubmitRstStream(const uint32_t code) {
   // if RST_STREAM received is not in scope and added to the list
   // causing endpoint to hang.
   if (session_->is_in_scope() && is_stream_cancel(code)) {
-      session_->AddPendingRstStream(id_);
-      return;
+    session_->AddPendingRstStream(id_);
+    return;
   }
 
+  // If RST_STREAM is submitted while nghttp2 is processing callbacks for
+  // a refused stream, don't force purge pending data. Sending pending data
+  // here can re-enter nghttp2 and close streams that are still being used
+  // by the active receive operation.
+  if (session_->is_in_scope() && code == NGHTTP2_REFUSED_STREAM) {
+    FlushRstStream();
+    return;
+  }
 
   // If possible, force a purge of any currently pending data here to make sure
   // it is sent before closing the stream. If it returns non-zero then we need
diff --git a/src/node_http2.h b/src/node_http2.h
index 91046052927..cb0e067aeaa 100644
--- a/src/node_http2.h
+++ b/src/node_http2.h
@@ -485,9 +485,11 @@ class Http2Stream : public AsyncWrap,
 
   // The Current Headers block... As headers are received for this stream,
   // they are temporarily stored here until the OnFrameReceived is called
-  // signalling the end of the HEADERS frame
+  // signalling the end of the HEADERS frame.
   nghttp2_headers_category current_headers_category_ = NGHTTP2_HCAT_HEADERS;
   uint32_t current_headers_length_ = 0;  // total number of octets
+  // Charged against maxSessionMemory while headers stay alive in JS.
+  uint64_t retained_headers_length_ = 0;
   std::vector<Http2Header> current_headers_;
 
   // This keeps track of the amount of data read from the socket while the
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
index b33beecaebe..176c607dce4 100644
--- a/src/node_http_parser.cc
+++ b/src/node_http_parser.cc
@@ -332,6 +332,11 @@ class Parser : public AsyncWrap, public StreamListener {
 
     if (num_fields_ == num_values_) {
       // start of new field name
+      rv = TrackHeaderPair();
+      if (rv != 0) {
+        return rv;
+      }
+
       num_fields_++;
       if (num_fields_ == kMaxHeaderFieldsCount) {
         // ran out of space - flush to javascript land
@@ -416,6 +421,7 @@ class Parser : public AsyncWrap, public StreamListener {
 
     num_fields_ = 0;
     num_values_ = 0;
+    header_pairs_ = 0;
 
     // METHOD
     if (parser_.type == HTTP_REQUEST) {
@@ -509,6 +515,8 @@ class Parser : public AsyncWrap, public StreamListener {
     if (num_fields_)
       Flush();  // Flush trailing HTTP headers.
 
+    header_pairs_ = 0;
+
     Local<Object> obj = object();
     Local<Value> cb = obj->Get(env()->context(),
                                kOnMessageComplete).ToLocalChecked();
@@ -972,6 +980,7 @@ class Parser : public AsyncWrap, public StreamListener {
     got_exception_ = false;
     headers_completed_ = false;
     max_http_header_size_ = max_http_header_size;
+    header_pairs_ = 0;
   }
 
 
@@ -984,6 +993,34 @@ class Parser : public AsyncWrap, public StreamListener {
     return 0;
   }
 
+  int TrackHeaderPair() {
+    if (parser_.type != HTTP_REQUEST) {
+      return 0;
+    }
+
+    header_pairs_ += 2;
+
+    Local<Value> max_header_pairs_v;
+    if (!object()
+             ->Get(env()->context(),
+                   FIXED_ONE_BYTE_STRING(env()->isolate(), "maxHeaderPairs"))
+             .ToLocal(&max_header_pairs_v)) {
+      got_exception_ = true;
+      return -1;
+    }
+
+    if (!max_header_pairs_v->IsNumber()) {
+      return 0;
+    }
+
+    const double max_header_pairs = max_header_pairs_v.As<Number>()->Value();
+    if (max_header_pairs > 0 && header_pairs_ > max_header_pairs) {
+      llhttp_set_error_reason(&parser_, "HPE_HEADER_OVERFLOW:Header overflow");
+      return HPE_USER;
+    }
+
+    return 0;
+  }
 
   int MaybePause() {
     if (!pending_pause_) {
@@ -1016,6 +1053,7 @@ class Parser : public AsyncWrap, public StreamListener {
   size_t current_buffer_len_;
   const char* current_buffer_data_;
   bool headers_completed_ = false;
+  size_t header_pairs_ = 0;
   bool pending_pause_ = false;
   uint64_t header_nread_ = 0;
   uint64_t chunk_extensions_nread_ = 0;
diff --git a/src/node_report.cc b/src/node_report.cc
index e1f4e30417d..ead720dd02d 100644
--- a/src/node_report.cc
+++ b/src/node_report.cc
@@ -851,13 +851,6 @@ std::string TriggerNodeReport(Isolate* isolate,
       filename = *DiagnosticFilename(
           env != nullptr ? env->thread_id() : 0, "report", "json");
     }
-    if (env != nullptr) {
-      THROW_IF_INSUFFICIENT_PERMISSIONS(
-          env,
-          permission::PermissionScope::kFileSystemWrite,
-          Environment::GetCwd(env->exec_path()),
-          filename);
-    }
   }
 
   // Open the report file stream for writing. Supports stdout/err,
@@ -875,12 +868,21 @@ std::string TriggerNodeReport(Isolate* isolate,
       report_directory = per_process::cli_options->report_directory;
     }
     // Regular file. Append filename to directory path if one was specified
+    std::string pathname;
     if (report_directory.length() > 0) {
-      std::string pathname = report_directory + kPathSeparator + filename;
-      outfile.open(pathname, std::ios::out | std::ios::binary);
+      pathname = report_directory + kPathSeparator + filename;
     } else {
-      outfile.open(filename, std::ios::out | std::ios::binary);
+      pathname = filename;
+    }
+
+    // We may not always be in a great state when generating a node report.
+    // Allow for the case where we don't have an env.
+    if (env != nullptr) {
+      THROW_IF_INSUFFICIENT_PERMISSIONS(
+          env, permission::PermissionScope::kFileSystemWrite, pathname, "");
     }
+
+    outfile.open(pathname, std::ios::out | std::ios::binary);
     // Check for errors on the file open
     if (!outfile.is_open()) {
       std::cerr << "\nFailed to open Node.js report file: " << filename;
diff --git a/src/node_trace_events.cc b/src/node_trace_events.cc
index 9787b143527..00f4057e085 100644
--- a/src/node_trace_events.cc
+++ b/src/node_trace_events.cc
@@ -5,7 +5,9 @@
 #include "node_external_reference.h"
 #include "node_internals.h"
 #include "node_v8_platform-inl.h"
+#include "permission/permission.h"
 #include "tracing/agent.h"
+#include "tracing/node_trace_writer.h"
 #include "util-inl.h"
 
 #include <set>
@@ -84,6 +86,12 @@ void NodeCategorySet::Enable(const FunctionCallbackInfo<Value>& args) {
   CHECK_NOT_NULL(category_set);
   const auto& categories = category_set->GetCategories();
   if (!category_set->enabled_ && !categories.empty()) {
+    const std::string filepath = tracing::NodeTraceWriter::GetFilePath(
+        per_process::cli_options->trace_event_file_pattern, 1);
+    THROW_IF_INSUFFICIENT_PERMISSIONS(
+        category_set->env(),
+        permission::PermissionScope::kFileSystemWrite,
+        filepath);
     // Starts the Tracing Agent if it wasn't started already (e.g. through
     // a command line flag.)
     StartTracingAgent();
diff --git a/src/node_version.h b/src/node_version.h
index d08a9fc0531..405c3691d87 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -24,7 +24,7 @@
 
 #define NODE_MAJOR_VERSION 22
 #define NODE_MINOR_VERSION 23
-#define NODE_PATCH_VERSION 1
+#define NODE_PATCH_VERSION 2
 
 #define NODE_VERSION_IS_LTS 1
 #define NODE_VERSION_LTS_CODENAME "Jod"
@@ -36,7 +36,7 @@
 #define NSOLID_MINOR_VERSION 3
 #define NSOLID_PATCH_VERSION 4
 
-#define NSOLID_VERSION_IS_RELEASE 0
+#define NSOLID_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index 5d12ab8f100..d2d9570baf1 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -447,7 +447,9 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork {
       if (!args[2]->Uint32Value(context).To(&in_off)) return;
       if (!args[3]->Uint32Value(context).To(&in_len)) return;
 
-      CHECK(Buffer::IsWithinBounds(in_off, in_len, Buffer::Length(in_buf)));
+      if (!Buffer::IsWithinBounds(in_off, in_len, Buffer::Length(in_buf))) {
+        return THROW_ERR_OUT_OF_RANGE(env, "input buffer is out of bounds");
+      }
       in = Buffer::Data(in_buf) + in_off;
     }
 
@@ -455,7 +457,9 @@ class CompressionStream : public AsyncWrap, public ThreadPoolWork {
     Local<Object> out_buf = args[4].As<Object>();
     if (!args[5]->Uint32Value(context).To(&out_off)) return;
     if (!args[6]->Uint32Value(context).To(&out_len)) return;
-    CHECK(Buffer::IsWithinBounds(out_off, out_len, Buffer::Length(out_buf)));
+    if (!Buffer::IsWithinBounds(out_off, out_len, Buffer::Length(out_buf))) {
+      return THROW_ERR_OUT_OF_RANGE(env, "output buffer is out of bounds");
+    }
     out = Buffer::Data(out_buf) + out_off;
 
     CompressionStream* ctx;
diff --git a/src/permission/fs_permission.h b/src/permission/fs_permission.h
index 22b29b017e2..7099dfa0719 100644
--- a/src/permission/fs_permission.h
+++ b/src/permission/fs_permission.h
@@ -48,12 +48,13 @@ class FSPermission final : public PermissionBase {
           children[label] = new Node(path_prefix);
           return children[label];
         }
+        bool child_was_end_node = child->IsEndNode();
 
         // swap prefix
         size_t i = 0;
         size_t prefix_len = path_prefix.length();
         for (; i < child->prefix.length(); ++i) {
-          if (i > prefix_len || path_prefix[i] != child->prefix[i]) {
+          if (i >= prefix_len || path_prefix[i] != child->prefix[i]) {
             std::string parent_prefix = child->prefix.substr(0, i);
             std::string child_prefix = child->prefix.substr(i);
 
@@ -65,7 +66,9 @@ class FSPermission final : public PermissionBase {
             return split_child->CreateChild(path_prefix.substr(i));
           }
         }
-        child->is_leaf = true;
+        if (child_was_end_node) {
+          child->is_leaf = true;
+        }
         return child->CreateChild(path_prefix.substr(i));
       }
 
diff --git a/src/tracing/node_trace_writer.cc b/src/tracing/node_trace_writer.cc
index 8f053efe933..6940df51d0f 100644
--- a/src/tracing/node_trace_writer.cc
+++ b/src/tracing/node_trace_writer.cc
@@ -8,9 +8,27 @@
 namespace node {
 namespace tracing {
 
+void replace_substring(std::string* target,
+                       const std::string& search,
+                       const std::string& insert) {
+  size_t pos = target->find(search);
+  for (; pos != std::string::npos; pos = target->find(search, pos)) {
+    target->replace(pos, search.size(), insert);
+    pos += insert.size();
+  }
+}
+
 NodeTraceWriter::NodeTraceWriter(const std::string& log_file_pattern)
     : log_file_pattern_(log_file_pattern) {}
 
+std::string NodeTraceWriter::GetFilePath(const std::string& log_file_pattern,
+                                         int file_num) {
+  std::string filepath(log_file_pattern);
+  replace_substring(&filepath, "${pid}", std::to_string(uv_os_getpid()));
+  replace_substring(&filepath, "${rotation}", std::to_string(file_num));
+  return filepath;
+}
+
 void NodeTraceWriter::InitializeOnThread(uv_loop_t* loop) {
   CHECK_NULL(tracing_loop_);
   tracing_loop_ = loop;
@@ -60,25 +78,13 @@ NodeTraceWriter::~NodeTraceWriter() {
   }
 }
 
-void replace_substring(std::string* target,
-                       const std::string& search,
-                       const std::string& insert) {
-  size_t pos = target->find(search);
-  for (; pos != std::string::npos; pos = target->find(search, pos)) {
-    target->replace(pos, search.size(), insert);
-    pos += insert.size();
-  }
-}
-
 void NodeTraceWriter::OpenNewFileForStreaming() {
   ++file_num_;
   uv_fs_t req;
 
   // Evaluate a JS-style template string, it accepts the values ${pid} and
   // ${rotation}
-  std::string filepath(log_file_pattern_);
-  replace_substring(&filepath, "${pid}", std::to_string(uv_os_getpid()));
-  replace_substring(&filepath, "${rotation}", std::to_string(file_num_));
+  std::string filepath(GetFilePath(log_file_pattern_, file_num_));
 
   if (fd_ != -1) {
     CHECK_EQ(uv_fs_close(nullptr, &req, fd_, nullptr), 0);
diff --git a/src/tracing/node_trace_writer.h b/src/tracing/node_trace_writer.h
index cd965d77b78..88a802425fc 100644
--- a/src/tracing/node_trace_writer.h
+++ b/src/tracing/node_trace_writer.h
@@ -19,6 +19,9 @@ class NodeTraceWriter : public AsyncTraceWriter {
   explicit NodeTraceWriter(const std::string& log_file_pattern);
   ~NodeTraceWriter() override;
 
+  static std::string GetFilePath(const std::string& log_file_pattern,
+                                 int file_num);
+
   void InitializeOnThread(uv_loop_t* loop) override;
   void AppendTraceEvent(TraceObject* trace_event) override;
   void Flush(bool blocking) override;
diff --git a/src/undici_version.h b/src/undici_version.h
index 297c1b5a58c..7079eb776af 100644
--- a/src/undici_version.h
+++ b/src/undici_version.h
@@ -2,5 +2,5 @@
 // Refer to tools/dep_updaters/update-undici.sh
 #ifndef SRC_UNDICI_VERSION_H_
 #define SRC_UNDICI_VERSION_H_
-#define UNDICI_VERSION "6.27.0"
+#define UNDICI_VERSION "6.28.0"
 #endif  // SRC_UNDICI_VERSION_H_
diff --git a/test/ffi/fixture_library/build/Makefile b/test/ffi/fixture_library/build/Makefile
new file mode 100644
index 00000000000..203f6a7d128
--- /dev/null
+++ b/test/ffi/fixture_library/build/Makefile
@@ -0,0 +1,354 @@
+# We borrow heavily from the kernel build setup, though we are simpler since
+# we don't have Kconfig tweaking settings on us.
+
+# The implicit make rules have it looking for RCS files, among other things.
+# We instead explicitly write all the rules we care about.
+# It's even quicker (saves ~200ms) to pass -r on the command line.
+MAKEFLAGS=-r
+
+# The source directory tree.
+srcdir := ..
+abs_srcdir := $(abspath $(srcdir))
+
+# The name of the builddir.
+builddir_name ?= .
+
+# The V=1 flag on command line makes us verbosely print command lines.
+ifdef V
+  quiet=
+else
+  quiet=quiet_
+endif
+
+# Specify BUILDTYPE=Release on the command line for a release build.
+BUILDTYPE ?= Release
+
+# Directory all our build output goes into.
+# Note that this must be two directories beneath src/ for unit tests to pass,
+# as they reach into the src/ directory for data with relative paths.
+builddir ?= $(builddir_name)/$(BUILDTYPE)
+abs_builddir := $(abspath $(builddir))
+depsdir := $(builddir)/.deps
+
+# Object output directory.
+obj := $(builddir)/obj
+abs_obj := $(abspath $(obj))
+
+# We build up a list of every single one of the targets so we can slurp in the
+# generated dependency rule Makefiles in one pass.
+all_deps :=
+
+
+
+CC.target ?= $(CC)
+CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS)
+CXX.target ?= $(CXX)
+CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
+LINK.target ?= $(LINK)
+LDFLAGS.target ?= $(LDFLAGS)
+AR.target ?= $(AR)
+PLI.target ?= pli
+
+# C++ apps need to be linked with g++.
+LINK ?= $(CXX.target)
+
+# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
+# to replicate this environment fallback in make as well.
+CC.host ?= gcc
+CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
+CXX.host ?= g++
+CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
+LINK.host ?= $(CXX.host)
+LDFLAGS.host ?= $(LDFLAGS_host)
+AR.host ?= ar
+PLI.host ?= pli
+
+# Define a dir function that can handle spaces.
+# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
+# "leading spaces cannot appear in the text of the first argument as written.
+# These characters can be put into the argument value by variable substitution."
+empty :=
+space := $(empty) $(empty)
+
+# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces
+replace_spaces = $(subst $(space),?,$1)
+unreplace_spaces = $(subst ?,$(space),$1)
+dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1)))
+
+# Flags to make gcc output dependency info.  Note that you need to be
+# careful here to use the flags that ccache and distcc can understand.
+# We write to a dep file on the side first and then rename at the end
+# so we can't end up with a broken dep file.
+depfile = $(depsdir)/$(call replace_spaces,$@).d
+DEPFLAGS = -MMD -MF $(depfile).raw
+
+# We have to fixup the deps output in a few ways.
+# (1) the file output should mention the proper .o file.
+# ccache or distcc lose the path to the target, so we convert a rule of
+# the form:
+#   foobar.o: DEP1 DEP2
+# into
+#   path/to/foobar.o: DEP1 DEP2
+# (2) we want missing files not to cause us to fail to build.
+# We want to rewrite
+#   foobar.o: DEP1 DEP2 \
+#               DEP3
+# to
+#   DEP1:
+#   DEP2:
+#   DEP3:
+# so if the files are missing, they're just considered phony rules.
+# We have to do some pretty insane escaping to get those backslashes
+# and dollar signs past make, the shell, and sed at the same time.
+# Doesn't work with spaces, but that's fine: .d files have spaces in
+# their names replaced with other characters.
+define fixup_dep
+# The depfile may not exist if the input file didn't have any #includes.
+touch $(depfile).raw
+# Fixup path as in (1).
+sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile)
+# Add extra rules as in (2).
+# We remove slashes and replace spaces with new lines;
+# remove blank lines;
+# delete the first line and append a colon to the remaining lines.
+sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\
+  grep -v '^$$'                             |\
+  sed -e 1d -e 's|$$|:|'                     \
+    >> $(depfile)
+rm $(depfile).raw
+endef
+
+# Command definitions:
+# - cmd_foo is the actual command to run;
+# - quiet_cmd_foo is the brief-output summary of the command.
+
+quiet_cmd_cc = CC($(TOOLSET)) $@
+cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c
+
+quiet_cmd_cxx = CXX($(TOOLSET)) $@
+cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c
+
+quiet_cmd_touch = TOUCH $@
+cmd_touch = touch $@
+
+quiet_cmd_copy = COPY $@
+# send stderr to /dev/null to ignore messages when linking directories.
+cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@")
+
+quiet_cmd_symlink = SYMLINK $@
+cmd_symlink = ln -sf "$<" "$@"
+
+quiet_cmd_alink = AR($(TOOLSET)) $@
+cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
+
+quiet_cmd_alink_thin = AR($(TOOLSET)) $@
+cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
+
+# Due to circular dependencies between libraries :(, we wrap the
+# special "figure out circular dependencies" flags around the entire
+# input list during linking.
+quiet_cmd_link = LINK($(TOOLSET)) $@
+cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
+
+# Note: this does not handle spaces in paths
+define xargs
+  $(1) $(word 1,$(2))
+$(if $(word 2,$(2)),$(call xargs,$(1),$(wordlist 2,$(words $(2)),$(2))))
+endef
+
+define write-to-file
+  @: >$(1)
+$(call xargs,@printf "%s\n" >>$(1),$(2))
+endef
+
+OBJ_FILE_LIST := ar-file-list
+
+define create_archive
+        rm -f $(1) $(1).$(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
+        $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
+        $(AR.$(TOOLSET)) crs $(1) @$(1).$(OBJ_FILE_LIST)
+endef
+
+define create_thin_archive
+        rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
+        $(call write-to-file,$(1).$(OBJ_FILE_LIST),$(filter %.o,$(2)))
+        $(AR.$(TOOLSET)) crsT $(1) @$(1).$(OBJ_FILE_LIST)
+endef
+
+# We support two kinds of shared objects (.so):
+# 1) shared_library, which is just bundling together many dependent libraries
+# into a link line.
+# 2) loadable_module, which is generating a module intended for dlopen().
+#
+# They differ only slightly:
+# In the former case, we want to package all dependent code into the .so.
+# In the latter case, we want to package just the API exposed by the
+# outermost module.
+# This means shared_library uses --whole-archive, while loadable_module doesn't.
+# (Note that --whole-archive is incompatible with the --start-group used in
+# normal linking.)
+
+# Other shared-object link notes:
+# - Set SONAME to the library filename so our binaries don't reference
+# the local, absolute paths used on the link command-line.
+quiet_cmd_solink = SOLINK($(TOOLSET)) $@
+cmd_solink = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS)
+
+quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
+cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
+
+
+# Define an escape_quotes function to escape single quotes.
+# This allows us to handle quotes properly as long as we always use
+# use single quotes and escape_quotes.
+escape_quotes = $(subst ','\'',$(1))
+# This comment is here just to include a ' to unconfuse syntax highlighting.
+# Define an escape_vars function to escape '$' variable syntax.
+# This allows us to read/write command lines with shell variables (e.g.
+# $LD_LIBRARY_PATH), without triggering make substitution.
+escape_vars = $(subst $$,$$$$,$(1))
+# Helper that expands to a shell command to echo a string exactly as it is in
+# make. This uses printf instead of echo because printf's behaviour with respect
+# to escape sequences is more portable than echo's across different shells
+# (e.g., dash, bash).
+exact_echo = printf '%s\n' '$(call escape_quotes,$(1))'
+
+# Helper to compare the command we're about to run against the command
+# we logged the last time we ran the command.  Produces an empty
+# string (false) when the commands match.
+# Tricky point: Make has no string-equality test function.
+# The kernel uses the following, but it seems like it would have false
+# positives, where one string reordered its arguments.
+#   arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
+#                       $(filter-out $(cmd_$@), $(cmd_$(1))))
+# We instead substitute each for the empty string into the other, and
+# say they're equal if both substitutions produce the empty string.
+# .d files contain ? instead of spaces, take that into account.
+command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\
+                       $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1))))
+
+# Helper that is non-empty when a prerequisite changes.
+# Normally make does this implicitly, but we force rules to always run
+# so we can check their command lines.
+#   $? -- new prerequisites
+#   $| -- order-only dependencies
+prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?))
+
+# Helper that executes all postbuilds until one fails.
+define do_postbuilds
+  @E=0;\
+  for p in $(POSTBUILDS); do\
+    eval $$p;\
+    E=$$?;\
+    if [ $$E -ne 0 ]; then\
+      break;\
+    fi;\
+  done;\
+  if [ $$E -ne 0 ]; then\
+    rm -rf "$@";\
+    exit $$E;\
+  fi
+endef
+
+# do_cmd: run a command via the above cmd_foo names, if necessary.
+# Should always run for a given target to handle command-line changes.
+# Second argument, if non-zero, makes it do asm/C/C++ dependency munging.
+# Third argument, if non-zero, makes it do POSTBUILDS processing.
+# Note: We intentionally do NOT call dirx for depfile, since it contains ? for
+# spaces already and dirx strips the ? characters.
+define do_cmd
+$(if $(or $(command_changed),$(prereq_changed)),
+  @$(call exact_echo,  $($(quiet)cmd_$(1)))
+  @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))"
+  $(if $(findstring flock,$(word 1,$(cmd_$1))),
+    @$(cmd_$(1))
+    @echo "  $(quiet_cmd_$(1)): Finished",
+    @$(cmd_$(1))
+  )
+  @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile)
+  @$(if $(2),$(fixup_dep))
+  $(if $(and $(3), $(POSTBUILDS)),
+    $(call do_postbuilds)
+  )
+)
+endef
+
+# Declare the "all" target first so it is the default,
+# even though we don't have the deps yet.
+.PHONY: all
+all:
+
+# make looks for ways to re-generate included makefiles, but in our case, we
+# don't have a direct way. Explicitly telling make that it has nothing to do
+# for them makes it go faster.
+%.d: ;
+
+# Use FORCE_DO_CMD to force a target to run.  Should be coupled with
+# do_cmd.
+.PHONY: FORCE_DO_CMD
+FORCE_DO_CMD:
+
+TOOLSET := target
+# Suffix rules, putting all outputs into $(obj).
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,ffi_test_library.target.mk)))),)
+  include ffi_test_library.target.mk
+endif
+
+quiet_cmd_regen_makefile = ACTION Regenerating $@
+cmd_regen_makefile = cd $(srcdir); /home/rafaelgss/repos/os/node-private/deps/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/rafaelgss/repos/os/node-private/out/Release/addons_headers" "-Dnode_gyp_dir=/home/rafaelgss/repos/os/node-private/deps/npm/node_modules/node-gyp" "-Dnode_lib_file=/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/$(Configuration)/node.lib" "-Dmodule_root_dir=/home/rafaelgss/repos/os/node-private/test/ffi/fixture_library" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/rafaelgss/repos/os/node-private/test/ffi/fixture_library/build/config.gypi -I/home/rafaelgss/repos/os/node-private/deps/npm/node_modules/node-gyp/addon.gypi -I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/include/node/common.gypi "--toplevel-dir=." binding.gyp
+Makefile: $(srcdir)/../../../deps/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../out/Release/addons_headers/include/node/common.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi
+	$(call do_cmd,regen_makefile)
+
+# "all" is a concatenation of the "all" targets from all the included
+# sub-makefiles. This is just here to clarify.
+all:
+
+# Add in dependency-tracking rules.  $(all_deps) is the list of every single
+# target in our tree. Only consider the ones with .d (dependency) info:
+d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d))
+ifneq ($(d_files),)
+  include $(d_files)
+endif
diff --git a/test/ffi/fixture_library/build/binding.Makefile b/test/ffi/fixture_library/build/binding.Makefile
new file mode 100644
index 00000000000..3fbe2b3dccc
--- /dev/null
+++ b/test/ffi/fixture_library/build/binding.Makefile
@@ -0,0 +1,6 @@
+# This file is generated by gyp; do not edit.
+
+export builddir_name ?= ./build/.
+.PHONY: all
+all:
+	$(MAKE) ffi_test_library
diff --git a/test/ffi/fixture_library/build/config.gypi b/test/ffi/fixture_library/build/config.gypi
new file mode 100644
index 00000000000..c60a63c3beb
--- /dev/null
+++ b/test/ffi/fixture_library/build/config.gypi
@@ -0,0 +1,570 @@
+# Do not edit. File was generated by node-gyp's "configure" step
+{
+  "variables": {
+    "use_ccache_win": 0,
+    "clang": 0,
+    "llvm_version": "0.0",
+    "gas_version": "2.42",
+    "node_enable_experimentals": "false",
+    "node_prefix": "/usr/local",
+    "node_install_npm": "true",
+    "node_install_corepack": "false",
+    "control_flow_guard": "false",
+    "node_use_amaro": "true",
+    "debug_node": "false",
+    "debug_symbols": "false",
+    "build_type%": "Release",
+    "error_on_warn": "false",
+    "suppress_all_error_on_warn": "false",
+    "use_prefix_to_find_headers": "false",
+    "host_arch": "x64",
+    "target_arch": "x64",
+    "node_byteorder": "little",
+    "cargo_rust_target": "",
+    "want_separate_host_toolset": 0,
+    "node_use_node_snapshot": "true",
+    "node_use_node_code_cache": "true",
+    "node_write_snapshot_as_array_literals": "false",
+    "node_enable_v8_vtunejit": "false",
+    "enable_pgo_generate": "false",
+    "enable_pgo_use": "false",
+    "enable_lto": "false",
+    "enable_thin_lto": "false",
+    "lto_jobs": "",
+    "single_executable_application": "true",
+    "node_use_lief": "true",
+    "node_with_ltcg": "false",
+    "node_tag": "",
+    "node_release_urlbase": "",
+    "node_debug_lib": "false",
+    "debug_nghttp2": "false",
+    "node_no_browser_globals": "false",
+    "node_shared": "false",
+    "libdir": "lib",
+    "node_module_version": 147,
+    "shlib_suffix": "so.147",
+    "asan": 0,
+    "ubsan": 0,
+    "coverage": "false",
+    "node_target_type": "executable",
+    "node_library_files": [
+      "lib/_http_agent.js",
+      "lib/_http_client.js",
+      "lib/_http_common.js",
+      "lib/_http_incoming.js",
+      "lib/_http_outgoing.js",
+      "lib/_http_server.js",
+      "lib/_tls_common.js",
+      "lib/_tls_wrap.js",
+      "lib/assert.js",
+      "lib/assert/strict.js",
+      "lib/async_hooks.js",
+      "lib/buffer.js",
+      "lib/child_process.js",
+      "lib/cluster.js",
+      "lib/console.js",
+      "lib/constants.js",
+      "lib/crypto.js",
+      "lib/dgram.js",
+      "lib/diagnostics_channel.js",
+      "lib/dns.js",
+      "lib/dns/promises.js",
+      "lib/domain.js",
+      "lib/dtls.js",
+      "lib/events.js",
+      "lib/ffi.js",
+      "lib/fs.js",
+      "lib/fs/promises.js",
+      "lib/http.js",
+      "lib/http2.js",
+      "lib/https.js",
+      "lib/inspector.js",
+      "lib/inspector/promises.js",
+      "lib/internal/abort_controller.js",
+      "lib/internal/assert.js",
+      "lib/internal/assert/assertion_error.js",
+      "lib/internal/assert/myers_diff.js",
+      "lib/internal/assert/utils.js",
+      "lib/internal/async_context_frame.js",
+      "lib/internal/async_hooks.js",
+      "lib/internal/async_local_storage/async_context_frame.js",
+      "lib/internal/async_local_storage/async_hooks.js",
+      "lib/internal/async_local_storage/run_scope.js",
+      "lib/internal/blob.js",
+      "lib/internal/blocklist.js",
+      "lib/internal/bootstrap/node.js",
+      "lib/internal/bootstrap/realm.js",
+      "lib/internal/bootstrap/shadow_realm.js",
+      "lib/internal/bootstrap/switches/does_not_own_process_state.js",
+      "lib/internal/bootstrap/switches/does_own_process_state.js",
+      "lib/internal/bootstrap/switches/is_main_thread.js",
+      "lib/internal/bootstrap/switches/is_not_main_thread.js",
+      "lib/internal/bootstrap/web/exposed-wildcard.js",
+      "lib/internal/bootstrap/web/exposed-window-or-worker.js",
+      "lib/internal/buffer.js",
+      "lib/internal/child_process.js",
+      "lib/internal/child_process/serialization.js",
+      "lib/internal/cli_table.js",
+      "lib/internal/cluster/child.js",
+      "lib/internal/cluster/primary.js",
+      "lib/internal/cluster/round_robin_handle.js",
+      "lib/internal/cluster/shared_handle.js",
+      "lib/internal/cluster/utils.js",
+      "lib/internal/cluster/worker.js",
+      "lib/internal/console/constructor.js",
+      "lib/internal/console/global.js",
+      "lib/internal/constants.js",
+      "lib/internal/crypto/aes.js",
+      "lib/internal/crypto/argon2.js",
+      "lib/internal/crypto/certificate.js",
+      "lib/internal/crypto/cfrg.js",
+      "lib/internal/crypto/chacha20_poly1305.js",
+      "lib/internal/crypto/cipher.js",
+      "lib/internal/crypto/diffiehellman.js",
+      "lib/internal/crypto/ec.js",
+      "lib/internal/crypto/hash.js",
+      "lib/internal/crypto/hashnames.js",
+      "lib/internal/crypto/hkdf.js",
+      "lib/internal/crypto/kem.js",
+      "lib/internal/crypto/keygen.js",
+      "lib/internal/crypto/keys.js",
+      "lib/internal/crypto/mac.js",
+      "lib/internal/crypto/ml_dsa.js",
+      "lib/internal/crypto/ml_kem.js",
+      "lib/internal/crypto/pbkdf2.js",
+      "lib/internal/crypto/random.js",
+      "lib/internal/crypto/rsa.js",
+      "lib/internal/crypto/scrypt.js",
+      "lib/internal/crypto/sig.js",
+      "lib/internal/crypto/util.js",
+      "lib/internal/crypto/webcrypto.js",
+      "lib/internal/crypto/webcrypto_util.js",
+      "lib/internal/crypto/webidl.js",
+      "lib/internal/crypto/x509.js",
+      "lib/internal/data_url.js",
+      "lib/internal/debugger/inspect.js",
+      "lib/internal/debugger/inspect_client.js",
+      "lib/internal/debugger/inspect_helpers.js",
+      "lib/internal/debugger/inspect_probe.js",
+      "lib/internal/debugger/inspect_repl.js",
+      "lib/internal/dgram.js",
+      "lib/internal/dns/callback_resolver.js",
+      "lib/internal/dns/promises.js",
+      "lib/internal/dns/utils.js",
+      "lib/internal/dtls/dtls.js",
+      "lib/internal/dtls/state.js",
+      "lib/internal/dtls/stats.js",
+      "lib/internal/dtls/symbols.js",
+      "lib/internal/encoding.js",
+      "lib/internal/encoding/single-byte.js",
+      "lib/internal/encoding/util.js",
+      "lib/internal/error_serdes.js",
+      "lib/internal/errors.js",
+      "lib/internal/errors/error_source.js",
+      "lib/internal/event_target.js",
+      "lib/internal/events/abort_listener.js",
+      "lib/internal/events/symbols.js",
+      "lib/internal/ffi-shared-buffer.js",
+      "lib/internal/ffi/fast-api.js",
+      "lib/internal/file.js",
+      "lib/internal/fixed_queue.js",
+      "lib/internal/freelist.js",
+      "lib/internal/freeze_intrinsics.js",
+      "lib/internal/fs/cp/cp-sync.js",
+      "lib/internal/fs/cp/cp.js",
+      "lib/internal/fs/dir.js",
+      "lib/internal/fs/glob.js",
+      "lib/internal/fs/promises.js",
+      "lib/internal/fs/read/context.js",
+      "lib/internal/fs/recursive_watch.js",
+      "lib/internal/fs/rimraf.js",
+      "lib/internal/fs/streams.js",
+      "lib/internal/fs/sync_write_stream.js",
+      "lib/internal/fs/utils.js",
+      "lib/internal/fs/watchers.js",
+      "lib/internal/heap_utils.js",
+      "lib/internal/histogram.js",
+      "lib/internal/http.js",
+      "lib/internal/http2/compat.js",
+      "lib/internal/http2/core.js",
+      "lib/internal/http2/util.js",
+      "lib/internal/inspector/network.js",
+      "lib/internal/inspector/network_http.js",
+      "lib/internal/inspector/network_http2.js",
+      "lib/internal/inspector/network_resources.js",
+      "lib/internal/inspector/network_undici.js",
+      "lib/internal/inspector/webstorage.js",
+      "lib/internal/inspector_async_hook.js",
+      "lib/internal/inspector_network_tracking.js",
+      "lib/internal/js_stream_socket.js",
+      "lib/internal/legacy/processbinding.js",
+      "lib/internal/linkedlist.js",
+      "lib/internal/locks.js",
+      "lib/internal/main/check_syntax.js",
+      "lib/internal/main/embedding.js",
+      "lib/internal/main/eval_stdin.js",
+      "lib/internal/main/eval_string.js",
+      "lib/internal/main/inspect.js",
+      "lib/internal/main/mksnapshot.js",
+      "lib/internal/main/print_help.js",
+      "lib/internal/main/prof_process.js",
+      "lib/internal/main/repl.js",
+      "lib/internal/main/run_main_module.js",
+      "lib/internal/main/test_runner.js",
+      "lib/internal/main/watch_mode.js",
+      "lib/internal/main/worker_thread.js",
+      "lib/internal/mime.js",
+      "lib/internal/modules/cjs/loader.js",
+      "lib/internal/modules/customization_hooks.js",
+      "lib/internal/modules/esm/assert.js",
+      "lib/internal/modules/esm/create_dynamic_module.js",
+      "lib/internal/modules/esm/get_format.js",
+      "lib/internal/modules/esm/hooks.js",
+      "lib/internal/modules/esm/load.js",
+      "lib/internal/modules/esm/loader.js",
+      "lib/internal/modules/esm/module_job.js",
+      "lib/internal/modules/esm/module_map.js",
+      "lib/internal/modules/esm/resolve.js",
+      "lib/internal/modules/esm/shared_constants.js",
+      "lib/internal/modules/esm/translators.js",
+      "lib/internal/modules/esm/utils.js",
+      "lib/internal/modules/esm/worker.js",
+      "lib/internal/modules/helpers.js",
+      "lib/internal/modules/package_json_reader.js",
+      "lib/internal/modules/package_map.js",
+      "lib/internal/modules/run_main.js",
+      "lib/internal/modules/typescript.js",
+      "lib/internal/navigator.js",
+      "lib/internal/net.js",
+      "lib/internal/options.js",
+      "lib/internal/per_context/domexception.js",
+      "lib/internal/per_context/messageport.js",
+      "lib/internal/per_context/primordials.js",
+      "lib/internal/perf/event_loop_delay.js",
+      "lib/internal/perf/event_loop_utilization.js",
+      "lib/internal/perf/nodetiming.js",
+      "lib/internal/perf/observe.js",
+      "lib/internal/perf/performance.js",
+      "lib/internal/perf/performance_entry.js",
+      "lib/internal/perf/resource_timing.js",
+      "lib/internal/perf/timerify.js",
+      "lib/internal/perf/usertiming.js",
+      "lib/internal/perf/utils.js",
+      "lib/internal/priority_queue.js",
+      "lib/internal/process/execution.js",
+      "lib/internal/process/finalization.js",
+      "lib/internal/process/per_thread.js",
+      "lib/internal/process/permission.js",
+      "lib/internal/process/pre_execution.js",
+      "lib/internal/process/promises.js",
+      "lib/internal/process/report.js",
+      "lib/internal/process/signal.js",
+      "lib/internal/process/task_queues.js",
+      "lib/internal/process/warning.js",
+      "lib/internal/process/worker_thread_only.js",
+      "lib/internal/promise_hooks.js",
+      "lib/internal/querystring.js",
+      "lib/internal/quic/diagnostics.js",
+      "lib/internal/quic/quic.js",
+      "lib/internal/quic/state.js",
+      "lib/internal/quic/stats.js",
+      "lib/internal/quic/symbols.js",
+      "lib/internal/readline/callbacks.js",
+      "lib/internal/readline/emitKeypressEvents.js",
+      "lib/internal/readline/interface.js",
+      "lib/internal/readline/promises.js",
+      "lib/internal/readline/utils.js",
+      "lib/internal/repl.js",
+      "lib/internal/repl/await.js",
+      "lib/internal/repl/completion.js",
+      "lib/internal/repl/history.js",
+      "lib/internal/repl/utils.js",
+      "lib/internal/socket_list.js",
+      "lib/internal/socketaddress.js",
+      "lib/internal/source_map/prepare_stack_trace.js",
+      "lib/internal/source_map/source_map.js",
+      "lib/internal/source_map/source_map_cache.js",
+      "lib/internal/source_map/source_map_cache_map.js",
+      "lib/internal/stream_base_commons.js",
+      "lib/internal/streams/add-abort-signal.js",
+      "lib/internal/streams/compose.js",
+      "lib/internal/streams/destroy.js",
+      "lib/internal/streams/duplex.js",
+      "lib/internal/streams/duplexify.js",
+      "lib/internal/streams/duplexpair.js",
+      "lib/internal/streams/end-of-stream.js",
+      "lib/internal/streams/fast-utf8-stream.js",
+      "lib/internal/streams/from.js",
+      "lib/internal/streams/iter/broadcast.js",
+      "lib/internal/streams/iter/classic.js",
+      "lib/internal/streams/iter/consumers.js",
+      "lib/internal/streams/iter/duplex.js",
+      "lib/internal/streams/iter/from.js",
+      "lib/internal/streams/iter/pull.js",
+      "lib/internal/streams/iter/push.js",
+      "lib/internal/streams/iter/ringbuffer.js",
+      "lib/internal/streams/iter/share.js",
+      "lib/internal/streams/iter/transform.js",
+      "lib/internal/streams/iter/types.js",
+      "lib/internal/streams/iter/utils.js",
+      "lib/internal/streams/lazy_transform.js",
+      "lib/internal/streams/legacy.js",
+      "lib/internal/streams/operators.js",
+      "lib/internal/streams/passthrough.js",
+      "lib/internal/streams/pipeline.js",
+      "lib/internal/streams/readable.js",
+      "lib/internal/streams/state.js",
+      "lib/internal/streams/transform.js",
+      "lib/internal/streams/utils.js",
+      "lib/internal/streams/writable.js",
+      "lib/internal/test/binding.js",
+      "lib/internal/test/transfer.js",
+      "lib/internal/test_runner/assert.js",
+      "lib/internal/test_runner/coverage.js",
+      "lib/internal/test_runner/harness.js",
+      "lib/internal/test_runner/mock/loader.js",
+      "lib/internal/test_runner/mock/mock.js",
+      "lib/internal/test_runner/mock/mock_timers.js",
+      "lib/internal/test_runner/reporter/dot.js",
+      "lib/internal/test_runner/reporter/junit.js",
+      "lib/internal/test_runner/reporter/lcov.js",
+      "lib/internal/test_runner/reporter/rerun.js",
+      "lib/internal/test_runner/reporter/spec.js",
+      "lib/internal/test_runner/reporter/tap.js",
+      "lib/internal/test_runner/reporter/utils.js",
+      "lib/internal/test_runner/reporter/v8-serializer.js",
+      "lib/internal/test_runner/runner.js",
+      "lib/internal/test_runner/snapshot.js",
+      "lib/internal/test_runner/tag_filter.js",
+      "lib/internal/test_runner/test.js",
+      "lib/internal/test_runner/tests_stream.js",
+      "lib/internal/test_runner/utils.js",
+      "lib/internal/timers.js",
+      "lib/internal/tls/common.js",
+      "lib/internal/tls/secure-context.js",
+      "lib/internal/tls/wrap.js",
+      "lib/internal/trace_events_async_hooks.js",
+      "lib/internal/tty.js",
+      "lib/internal/url.js",
+      "lib/internal/util.js",
+      "lib/internal/util/colors.js",
+      "lib/internal/util/comparisons.js",
+      "lib/internal/util/debuglog.js",
+      "lib/internal/util/diff.js",
+      "lib/internal/util/inspect.js",
+      "lib/internal/util/inspector.js",
+      "lib/internal/util/parse_args/parse_args.js",
+      "lib/internal/util/parse_args/utils.js",
+      "lib/internal/util/trace_sigint.js",
+      "lib/internal/util/types.js",
+      "lib/internal/v8/cpu_profiler.js",
+      "lib/internal/v8/heap_profile.js",
+      "lib/internal/v8/startup_snapshot.js",
+      "lib/internal/v8_prof_polyfill.js",
+      "lib/internal/validators.js",
+      "lib/internal/vfs/dir.js",
+      "lib/internal/vfs/errors.js",
+      "lib/internal/vfs/fd.js",
+      "lib/internal/vfs/file_handle.js",
+      "lib/internal/vfs/file_system.js",
+      "lib/internal/vfs/provider.js",
+      "lib/internal/vfs/providers/memory.js",
+      "lib/internal/vfs/providers/real.js",
+      "lib/internal/vfs/router.js",
+      "lib/internal/vfs/setup.js",
+      "lib/internal/vfs/stats.js",
+      "lib/internal/vfs/streams.js",
+      "lib/internal/vfs/watcher.js",
+      "lib/internal/vm.js",
+      "lib/internal/vm/module.js",
+      "lib/internal/wasm_web_api.js",
+      "lib/internal/watch_mode/files_watcher.js",
+      "lib/internal/watchdog.js",
+      "lib/internal/webidl.js",
+      "lib/internal/webstorage.js",
+      "lib/internal/webstreams/adapters.js",
+      "lib/internal/webstreams/compression.js",
+      "lib/internal/webstreams/encoding.js",
+      "lib/internal/webstreams/queuingstrategies.js",
+      "lib/internal/webstreams/readablestream.js",
+      "lib/internal/webstreams/transfer.js",
+      "lib/internal/webstreams/transformstream.js",
+      "lib/internal/webstreams/util.js",
+      "lib/internal/webstreams/writablestream.js",
+      "lib/internal/worker.js",
+      "lib/internal/worker/clone_dom_exception.js",
+      "lib/internal/worker/io.js",
+      "lib/internal/worker/js_transferable.js",
+      "lib/internal/worker/messaging.js",
+      "lib/module.js",
+      "lib/net.js",
+      "lib/os.js",
+      "lib/path.js",
+      "lib/path/posix.js",
+      "lib/path/win32.js",
+      "lib/perf_hooks.js",
+      "lib/process.js",
+      "lib/punycode.js",
+      "lib/querystring.js",
+      "lib/quic.js",
+      "lib/readline.js",
+      "lib/readline/promises.js",
+      "lib/repl.js",
+      "lib/sea.js",
+      "lib/sqlite.js",
+      "lib/stream.js",
+      "lib/stream/consumers.js",
+      "lib/stream/iter.js",
+      "lib/stream/promises.js",
+      "lib/stream/web.js",
+      "lib/string_decoder.js",
+      "lib/sys.js",
+      "lib/test.js",
+      "lib/test/reporters.js",
+      "lib/timers.js",
+      "lib/timers/promises.js",
+      "lib/tls.js",
+      "lib/trace_events.js",
+      "lib/tty.js",
+      "lib/url.js",
+      "lib/util.js",
+      "lib/util/types.js",
+      "lib/v8.js",
+      "lib/vfs.js",
+      "lib/vm.js",
+      "lib/wasi.js",
+      "lib/worker_threads.js",
+      "lib/zlib.js",
+      "lib/zlib/iter.js"
+    ],
+    "node_cctest_sources": [
+      "test/cctest/inspector/test_network_requests_buffer.cc",
+      "test/cctest/inspector/test_node_protocol.cc",
+      "test/cctest/node_test_fixture.cc",
+      "test/cctest/test_aliased_buffer.cc",
+      "test/cctest/test_base64.cc",
+      "test/cctest/test_base_object_ptr.cc",
+      "test/cctest/test_cppgc.cc",
+      "test/cctest/test_crypto_clienthello.cc",
+      "test/cctest/test_dataqueue.cc",
+      "test/cctest/test_diagnostics_channel.cc",
+      "test/cctest/test_environment.cc",
+      "test/cctest/test_inspector_socket.cc",
+      "test/cctest/test_inspector_socket_server.cc",
+      "test/cctest/test_json_utils.cc",
+      "test/cctest/test_linked_binding.cc",
+      "test/cctest/test_lru_cache.cc",
+      "test/cctest/test_node_api.cc",
+      "test/cctest/test_node_crypto.cc",
+      "test/cctest/test_node_crypto_env.cc",
+      "test/cctest/test_node_ipc_serdes.cc",
+      "test/cctest/test_node_postmortem_metadata.cc",
+      "test/cctest/test_node_task_runner.cc",
+      "test/cctest/test_path.cc",
+      "test/cctest/test_per_process.cc",
+      "test/cctest/test_platform.cc",
+      "test/cctest/test_quic_arena.cc",
+      "test/cctest/test_quic_cid.cc",
+      "test/cctest/test_quic_error.cc",
+      "test/cctest/test_quic_preferredaddress.cc",
+      "test/cctest/test_quic_tokenbucket.cc",
+      "test/cctest/test_quic_tokens.cc",
+      "test/cctest/test_report.cc",
+      "test/cctest/test_sockaddr.cc",
+      "test/cctest/test_string_bytes.cc",
+      "test/cctest/test_traced_value.cc",
+      "test/cctest/test_util.cc",
+      "test/cctest/node_test_fixture.h"
+    ],
+    "napi_build_version": "10",
+    "node_shared_zlib": "false",
+    "node_shared_http_parser": "false",
+    "node_shared_libuv": "false",
+    "node_shared_ada": "false",
+    "node_shared_simdjson": "false",
+    "node_shared_simdutf": "false",
+    "node_shared_brotli": "false",
+    "node_shared_cares": "false",
+    "node_shared_gtest": "false",
+    "node_shared_hdr_histogram": "false",
+    "node_shared_merve": "false",
+    "node_shared_nbytes": "false",
+    "node_shared_nghttp2": "false",
+    "node_shared_nghttp3": "false",
+    "node_shared_ngtcp2": "false",
+    "node_shared_lief": "false",
+    "node_use_sqlite": "true",
+    "node_shared_sqlite": "false",
+    "node_use_ffi": "true",
+    "node_shared_ffi": "false",
+    "node_shared_temporal_capi": "false",
+    "node_shared_uvwasi": "false",
+    "node_shared_zstd": "false",
+    "v8_enable_webassembly": 1,
+    "v8_enable_javascript_promise_hooks": 1,
+    "v8_enable_lite_mode": 0,
+    "v8_enable_gdbjit": 1,
+    "v8_optimized_debug": 1,
+    "dcheck_always_on": 0,
+    "v8_enable_object_print": 1,
+    "v8_random_seed": 0,
+    "v8_promise_internal_field_count": 1,
+    "v8_use_siphash": 1,
+    "v8_enable_maglev": 1,
+    "v8_enable_pointer_compression": 0,
+    "v8_enable_sandbox": 0,
+    "v8_enable_pointer_compression_shared_cage": 0,
+    "v8_enable_external_code_space": 0,
+    "v8_enable_31bit_smis_on_64bit_arch": 0,
+    "v8_enable_extensible_ro_snapshot": 0,
+    "v8_enable_temporal_support": 0,
+    "v8_trace_maps": 0,
+    "node_use_v8_platform": "true",
+    "node_use_bundled_v8": "true",
+    "force_dynamic_crt": 0,
+    "node_enable_d8": "false",
+    "node_enable_v8windbg": "false",
+    "v8_enable_hugepage": 0,
+    "v8_enable_short_builtin_calls": 1,
+    "v8_enable_wasm_simd256_revec": 1,
+    "node_use_openssl": "true",
+    "node_shared_openssl": "false",
+    "openssl_is_fips": "false",
+    "node_fipsinstall": "false",
+    "node_without_node_options": "false",
+    "openssl_version": 810549375,
+    "node_use_quic": "false",
+    "node_use_dtls": "false",
+    "icu_small": "false",
+    "icu_system": "false",
+    "v8_enable_i18n_support": 1,
+    "icu_gyp_path": "tools/icu/icu-generic.gyp",
+    "icu_path": "deps/icu-small",
+    "icu_ver_major": "78",
+    "icu_endianness": "l",
+    "icu_data_in": "../../deps/icu-tmp/icudt78l.dat",
+    "v8_enable_inspector": 1,
+    "node_section_ordering_info": "",
+    "node_builtin_shareable_builtins": [
+      "deps/undici/undici.js",
+      "deps/amaro/dist/index.js"
+    ],
+    "ossfuzz": "false",
+    "v8_enable_v8_checks": 0,
+    "nodedir": "/home/rafaelgss/repos/os/node-private/out/Release/addons_headers",
+    "python": "/usr/bin/python3.12",
+    "standalone_static_library": 1
+  },
+  "target_defaults": {
+    "include_dirs": [],
+    "libraries": [],
+    "defines": [],
+    "cflags": [],
+    "conditions": [],
+    "default_configuration": "Release",
+    "configurations": {
+      "Release": {},
+      "Debug": {}
+    }
+  }
+}
diff --git a/test/ffi/fixture_library/build/ffi_test_library.target.mk b/test/ffi/fixture_library/build/ffi_test_library.target.mk
new file mode 100644
index 00000000000..a24038be386
--- /dev/null
+++ b/test/ffi/fixture_library/build/ffi_test_library.target.mk
@@ -0,0 +1,155 @@
+# This file is generated by gyp; do not edit.
+
+TOOLSET := target
+TARGET := ffi_test_library
+DEFS_Debug := \
+	'-DNODE_GYP_MODULE_NAME=ffi_test_library' \
+	'-DUSING_UV_SHARED=1' \
+	'-DUSING_V8_SHARED=1' \
+	'-DV8_DEPRECATION_WARNINGS=1' \
+	'-D_GLIBCXX_USE_CXX11_ABI=1' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_LARGEFILE_SOURCE' \
+	'-D__STDC_FORMAT_MACROS' \
+	'-DOPENSSL_NO_PINSHARED' \
+	'-DOPENSSL_THREADS' \
+	'-DDEBUG' \
+	'-D_DEBUG'
+
+# Flags passed to all source files.
+CFLAGS_Debug := \
+	-fPIC \
+	-pthread \
+	-Wall \
+	-Wextra \
+	-Wno-unused-parameter \
+	-m64 \
+	-g \
+	-O0
+
+# Flags passed to only C files.
+CFLAGS_C_Debug :=
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Debug := \
+	-fno-rtti \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-std=gnu++20
+
+INCS_Debug := \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/include/node \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/src \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/openssl/config \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/openssl/openssl/include \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/uv/include \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/zlib \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/v8/include
+
+DEFS_Release := \
+	'-DNODE_GYP_MODULE_NAME=ffi_test_library' \
+	'-DUSING_UV_SHARED=1' \
+	'-DUSING_V8_SHARED=1' \
+	'-DV8_DEPRECATION_WARNINGS=1' \
+	'-D_GLIBCXX_USE_CXX11_ABI=1' \
+	'-D_FILE_OFFSET_BITS=64' \
+	'-D_LARGEFILE_SOURCE' \
+	'-D__STDC_FORMAT_MACROS' \
+	'-DOPENSSL_NO_PINSHARED' \
+	'-DOPENSSL_THREADS'
+
+# Flags passed to all source files.
+CFLAGS_Release := \
+	-fPIC \
+	-pthread \
+	-Wall \
+	-Wextra \
+	-Wno-unused-parameter \
+	-m64 \
+	-O3 \
+	-fno-omit-frame-pointer
+
+# Flags passed to only C files.
+CFLAGS_C_Release :=
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Release := \
+	-fno-rtti \
+	-fno-exceptions \
+	-fno-strict-aliasing \
+	-std=gnu++20
+
+INCS_Release := \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/include/node \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/src \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/openssl/config \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/openssl/openssl/include \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/uv/include \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/zlib \
+	-I/home/rafaelgss/repos/os/node-private/out/Release/addons_headers/deps/v8/include
+
+OBJS := \
+	$(obj).target/$(TARGET)/ffi_test_library.o
+
+# Add to the list of files we specially track dependencies for.
+all_deps += $(OBJS)
+
+# CFLAGS et al overrides must be target-local.
+# See "Target-specific Variable Values" in the GNU Make manual.
+$(OBJS): TOOLSET := $(TOOLSET)
+$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
+$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+
+# Suffix rules, putting all outputs into $(obj).
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# End of this set of suffix rules
+### Rules for final target.
+LDFLAGS_Debug := \
+	-pthread \
+	-rdynamic \
+	-m64
+
+LDFLAGS_Release := \
+	-pthread \
+	-rdynamic \
+	-m64
+
+LIBS :=
+
+$(obj).target/ffi_test_library.so: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(obj).target/ffi_test_library.so: LIBS := $(LIBS)
+$(obj).target/ffi_test_library.so: LD_INPUTS := $(OBJS)
+$(obj).target/ffi_test_library.so: TOOLSET := $(TOOLSET)
+$(obj).target/ffi_test_library.so: $(OBJS) FORCE_DO_CMD
+	$(call do_cmd,solink)
+
+all_deps += $(obj).target/ffi_test_library.so
+# Add target alias
+.PHONY: ffi_test_library
+ffi_test_library: $(builddir)/ffi_test_library.so
+
+# Copy this to the shared library output path.
+$(builddir)/ffi_test_library.so: TOOLSET := $(TOOLSET)
+$(builddir)/ffi_test_library.so: $(obj).target/ffi_test_library.so FORCE_DO_CMD
+	$(call do_cmd,copy)
+
+all_deps += $(builddir)/ffi_test_library.so
+# Short alias for building this shared library.
+.PHONY: ffi_test_library.so
+ffi_test_library.so: $(obj).target/ffi_test_library.so $(builddir)/ffi_test_library.so
+
+# Add shared library to "all" target.
+.PHONY: all
+all: $(builddir)/ffi_test_library.so
+
diff --git a/test/node_trace.1.log b/test/node_trace.1.log
new file mode 100644
index 00000000000..5f3be5b0c76
--- /dev/null
+++ b/test/node_trace.1.log
@@ -0,0 +1 @@
+{"traceEvents":[{"pid":1610388,"tid":1610388,"ts":105658229815,"tts":7219,"ph":"b","cat":"node,node.environment","name":"Environment","dur":0,"tdur":0,"id":"0x62b917612c10","args":{"args":{"args":["out/Release/node","/home/rafaelgss/repos/os/node-private/test/parallel/test-permission-fs-write-trace-events.js"],"exec_args":["--expose-internals","--trace-event-categories=node"]}}},{"pid":1610388,"tid":1610388,"ts":105658229790,"tts":8908,"ph":"I","cat":"node,node.bootstrap","name":"environment","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658223625,"tts":8909,"ph":"I","cat":"node,node.bootstrap","name":"nodeStart","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658224800,"tts":8909,"ph":"I","cat":"node,node.bootstrap","name":"v8Start","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658231956,"tts":9360,"ph":"I","cat":"node,node.bootstrap","name":"bootstrapComplete","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232063,"tts":9467,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232065,"tts":9468,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232068,"tts":9472,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232069,"tts":9472,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232070,"tts":9474,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232071,"tts":9475,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232072,"tts":9476,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232073,"tts":9476,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232074,"tts":9477,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232075,"tts":9478,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232076,"tts":9480,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232077,"tts":9481,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232078,"tts":9482,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232079,"tts":9482,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232080,"tts":9484,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232081,"tts":9485,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232149,"tts":9552,"ph":"b","cat":"node,node.module_timer","name":"require('/home/rafaelgss/repos/os/node-private/test/parallel/test-permission-fs-write-trace-events.js')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658232226,"tts":9630,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232229,"tts":9632,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232229,"tts":9633,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232232,"tts":9635,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232233,"tts":9636,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232234,"tts":9638,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232341,"tts":9744,"ph":"b","cat":"node,node.module_timer","name":"require('../common')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658232466,"tts":9870,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232468,"tts":9871,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232472,"tts":9875,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232473,"tts":9876,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232501,"tts":9905,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232503,"tts":9906,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232503,"tts":9907,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232508,"tts":9912,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232526,"tts":9930,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232527,"tts":9931,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658232956,"tts":10360,"ph":"b","cat":"node,node.module_timer","name":"require('assert')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234040,"tts":11431,"ph":"e","cat":"node,node.module_timer","name":"require('assert')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234046,"tts":11437,"ph":"b","cat":"node,node.module_timer","name":"require('fs')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234067,"tts":11459,"ph":"e","cat":"node,node.module_timer","name":"require('fs')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234070,"tts":11461,"ph":"b","cat":"node,node.module_timer","name":"require('net')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234449,"tts":11841,"ph":"e","cat":"node,node.module_timer","name":"require('net')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234454,"tts":11845,"ph":"b","cat":"node,node.module_timer","name":"require('path')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234465,"tts":11856,"ph":"e","cat":"node,node.module_timer","name":"require('path')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234467,"tts":11858,"ph":"b","cat":"node,node.module_timer","name":"require('util')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234475,"tts":11866,"ph":"e","cat":"node,node.module_timer","name":"require('util')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234477,"tts":11868,"ph":"b","cat":"node,node.module_timer","name":"require('worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234770,"tts":12161,"ph":"e","cat":"node,node.module_timer","name":"require('worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234773,"tts":12164,"ph":"b","cat":"node,node.module_timer","name":"require('./tmpdir')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658234859,"tts":12250,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234860,"tts":12251,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234890,"tts":12281,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234893,"tts":12285,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234894,"tts":12285,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234896,"tts":12287,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234898,"tts":12289,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234899,"tts":12290,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658234997,"tts":12389,"ph":"b","cat":"node,node.module_timer","name":"require('child_process')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235317,"tts":12708,"ph":"e","cat":"node,node.module_timer","name":"require('child_process')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235321,"tts":12712,"ph":"b","cat":"node,node.module_timer","name":"require('fs')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235329,"tts":12720,"ph":"e","cat":"node,node.module_timer","name":"require('fs')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235330,"tts":12722,"ph":"b","cat":"node,node.module_timer","name":"require('path')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235339,"tts":12730,"ph":"e","cat":"node,node.module_timer","name":"require('path')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235343,"tts":12734,"ph":"b","cat":"node,node.module_timer","name":"require('url')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235353,"tts":12744,"ph":"e","cat":"node,node.module_timer","name":"require('url')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235356,"tts":12747,"ph":"b","cat":"node,node.module_timer","name":"require('worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235360,"tts":12751,"ph":"e","cat":"node,node.module_timer","name":"require('worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235381,"tts":12772,"ph":"e","cat":"node,node.module_timer","name":"require('./tmpdir')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235384,"tts":12775,"ph":"b","cat":"node,node.module_timer","name":"require('buffer')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235391,"tts":12782,"ph":"e","cat":"node,node.module_timer","name":"require('buffer')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658235443,"tts":12834,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658235448,"tts":12839,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658235448,"tts":12839,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658235542,"tts":12933,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658235548,"tts":12939,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658235550,"tts":12941,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658237967,"tts":15354,"ph":"b","cat":"node,node.module_timer","name":"require('node:worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658237982,"tts":15368,"ph":"e","cat":"node,node.module_timer","name":"require('node:worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238050,"tts":15436,"ph":"e","cat":"node,node.module_timer","name":"require('../common')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238052,"tts":15438,"ph":"b","cat":"node,node.module_timer","name":"require('../common/child_process')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238095,"tts":15481,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238096,"tts":15482,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.lstat","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238134,"tts":15520,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238137,"tts":15523,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238138,"tts":15524,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238140,"tts":15526,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238142,"tts":15528,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238143,"tts":15529,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238250,"tts":15636,"ph":"b","cat":"node,node.module_timer","name":"require('assert')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238258,"tts":15644,"ph":"e","cat":"node,node.module_timer","name":"require('assert')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238260,"tts":15646,"ph":"b","cat":"node,node.module_timer","name":"require('child_process')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238263,"tts":15649,"ph":"e","cat":"node,node.module_timer","name":"require('child_process')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238264,"tts":15650,"ph":"b","cat":"node,node.module_timer","name":"require('./')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238299,"tts":15685,"ph":"e","cat":"node,node.module_timer","name":"require('./')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238300,"tts":15686,"ph":"b","cat":"node,node.module_timer","name":"require('util')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238302,"tts":15688,"ph":"e","cat":"node,node.module_timer","name":"require('util')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238323,"tts":15709,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238326,"tts":15712,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.open","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238327,"tts":15713,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238417,"tts":15803,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.read","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238422,"tts":15808,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238424,"tts":15810,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.close","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238462,"tts":15848,"ph":"e","cat":"node,node.module_timer","name":"require('../common/child_process')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238464,"tts":15850,"ph":"b","cat":"node,node.module_timer","name":"require('worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238468,"tts":15854,"ph":"e","cat":"node,node.module_timer","name":"require('worker_threads')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238469,"tts":15855,"ph":"b","cat":"node,node.module_timer","name":"require('assert')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238471,"tts":15857,"ph":"e","cat":"node,node.module_timer","name":"require('assert')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238472,"tts":15858,"ph":"b","cat":"node,node.module_timer","name":"require('fs')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238474,"tts":15860,"ph":"e","cat":"node,node.module_timer","name":"require('fs')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238475,"tts":15861,"ph":"b","cat":"node,node.module_timer","name":"require('../common/tmpdir')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238496,"tts":15882,"ph":"e","cat":"node,node.module_timer","name":"require('../common/tmpdir')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238497,"tts":15883,"ph":"b","cat":"node,node.module_timer","name":"require('trace_events')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238532,"tts":15918,"ph":"e","cat":"node,node.module_timer","name":"require('trace_events')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658238588,"tts":15974,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.mkdir","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238617,"tts":16003,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.mkdir","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238638,"tts":16024,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.mkdir","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238647,"tts":16033,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.mkdir","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238648,"tts":16034,"ph":"B","cat":"node,node.fs,node.fs.sync","name":"fs.sync.mkdir","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658238655,"tts":16041,"ph":"E","cat":"node,node.fs,node.fs.sync","name":"fs.sync.mkdir","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658256686,"tts":16845,"ph":"e","cat":"node,node.module_timer","name":"require('/home/rafaelgss/repos/os/node-private/test/parallel/test-permission-fs-write-trace-events.js')","dur":0,"tdur":0,"id":"0x0","args":{}},{"pid":1610388,"tid":1610388,"ts":105658256692,"tts":16851,"ph":"I","cat":"node,node.bootstrap","name":"loopStart","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658256982,"tts":17141,"ph":"X","cat":"node,node.environment","name":"BeforeExit","dur":5,"tdur":5,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658256987,"tts":17147,"ph":"I","cat":"node,node.bootstrap","name":"loopExit","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658257177,"tts":17336,"ph":"X","cat":"node,node.environment","name":"RunCleanup","dur":17,"tdur":17,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658257179,"tts":17338,"ph":"X","cat":"node,node.environment","name":"RunAndClearNativeImmediates","dur":0,"tdur":1,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658257189,"tts":17348,"ph":"X","cat":"node,node.realm","name":"RunCleanup","dur":4,"tdur":4,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658257193,"tts":17353,"ph":"X","cat":"node,node.environment","name":"RunAndClearNativeImmediates","dur":0,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658257194,"tts":17354,"ph":"X","cat":"node,node.environment","name":"AtExit","dur":1,"tdur":0,"args":{}},{"pid":1610388,"tid":1610388,"ts":105658257202,"tts":17361,"ph":"e","cat":"node,node.environment","name":"Environment","dur":0,"tdur":0,"id":"0x62b917612c10","args":{}},{"pid":1610388,"tid":1610388,"ts":105658224566,"tts":2008,"ph":"M","cat":"__metadata","name":"process_name","dur":0,"tdur":0,"args":{"name":"out/Release/node"}},{"pid":1610388,"tid":1610388,"ts":105658224568,"tts":2010,"ph":"M","cat":"__metadata","name":"version","dur":0,"tdur":0,"args":{"node":"24.18.1-pre"}},{"pid":1610388,"tid":1610388,"ts":105658224568,"tts":2010,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"JavaScriptMainThread"}},{"pid":1610388,"tid":1610388,"ts":105658224575,"tts":2017,"ph":"M","cat":"__metadata","name":"node","dur":0,"tdur":0,"args":{"process":{"versions":{"acorn":"8.16.0","ada":"3.4.4","amaro":"1.1.9","ares":"1.34.6","brotli":"1.2.0","cldr":"48.0","icu":"78.3","llhttp":"9.4.2","merve":"1.2.2","modules":"137","napi":"10","nbytes":"0.1.4","ncrypto":"0.0.1","nghttp2":"1.69.0","nghttp3":"","ngtcp2":"","node":"24.18.1-pre","openssl":"3.5.7","simdjson":"4.6.4","simdutf":"6.4.0","sqlite":"3.53.1","tz":"2026b","undici":"7.28.0","unicode":"17.0","uv":"1.52.1","uvwasi":"0.0.23","v8":"13.6.233.17-node.50","zlib":"1.3.1-e00f703","zstd":"1.5.7"},"arch":"x64","platform":"linux","release":{"name":"node","lts":"Krypton"}}}},{"pid":1610388,"tid":1610400,"ts":105658224596,"tts":13,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"WorkerThreadsTaskRunner::DelayedTaskScheduler"}},{"pid":1610388,"tid":1610401,"ts":105658224646,"tts":15,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610402,"ts":105658224654,"tts":16,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610403,"ts":105658224666,"tts":20,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610404,"ts":105658224670,"tts":8,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610388,"ts":105658224566,"tts":2008,"ph":"M","cat":"__metadata","name":"process_name","dur":0,"tdur":0,"args":{"name":"out/Release/node"}},{"pid":1610388,"tid":1610388,"ts":105658224568,"tts":2010,"ph":"M","cat":"__metadata","name":"version","dur":0,"tdur":0,"args":{"node":"24.18.1-pre"}},{"pid":1610388,"tid":1610388,"ts":105658224568,"tts":2010,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"JavaScriptMainThread"}},{"pid":1610388,"tid":1610388,"ts":105658224575,"tts":2017,"ph":"M","cat":"__metadata","name":"node","dur":0,"tdur":0,"args":{"process":{"versions":{"acorn":"8.16.0","ada":"3.4.4","amaro":"1.1.9","ares":"1.34.6","brotli":"1.2.0","cldr":"48.0","icu":"78.3","llhttp":"9.4.2","merve":"1.2.2","modules":"137","napi":"10","nbytes":"0.1.4","ncrypto":"0.0.1","nghttp2":"1.69.0","nghttp3":"","ngtcp2":"","node":"24.18.1-pre","openssl":"3.5.7","simdjson":"4.6.4","simdutf":"6.4.0","sqlite":"3.53.1","tz":"2026b","undici":"7.28.0","unicode":"17.0","uv":"1.52.1","uvwasi":"0.0.23","v8":"13.6.233.17-node.50","zlib":"1.3.1-e00f703","zstd":"1.5.7"},"arch":"x64","platform":"linux","release":{"name":"node","lts":"Krypton"}}}},{"pid":1610388,"tid":1610400,"ts":105658224596,"tts":13,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"WorkerThreadsTaskRunner::DelayedTaskScheduler"}},{"pid":1610388,"tid":1610401,"ts":105658224646,"tts":15,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610402,"ts":105658224654,"tts":16,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610403,"ts":105658224666,"tts":20,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}},{"pid":1610388,"tid":1610404,"ts":105658224670,"tts":8,"ph":"M","cat":"__metadata","name":"thread_name","dur":0,"tdur":0,"args":{"name":"PlatformWorkerThread"}}]}
\ No newline at end of file
diff --git a/test/parallel/test-dns-resolveany-ttl-overflow.js b/test/parallel/test-dns-resolveany-ttl-overflow.js
new file mode 100644
index 00000000000..c8cc4fbc955
--- /dev/null
+++ b/test/parallel/test-dns-resolveany-ttl-overflow.js
@@ -0,0 +1,69 @@
+'use strict';
+const common = require('../common');
+const dnstools = require('../common/dns');
+const assert = require('assert');
+const dgram = require('dgram');
+const dns = require('dns');
+
+const dnsPromises = dns.promises;
+
+const kRecordCount = 257;
+const kADomain = 'many-a.example.org';
+
+const server = dgram.createSocket('udp4');
+
+server.on('message', common.mustCall((msg, { address, port }) => {
+  const parsed = dnstools.parseDNSPacket(msg);
+  const question = parsed.questions[0];
+  const { domain } = question;
+
+  assert.strictEqual(question.type, 'ANY');
+  assert.strictEqual(domain, kADomain);
+
+  server.send(dnstools.writeDNSPacket({
+    id: parsed.id,
+    questions: parsed.questions,
+    answers: createARecords(domain),
+  }), port, address);
+}, 2));
+
+server.bind(0, common.mustCall(async () => {
+  const { port } = server.address();
+  const callbackResolver = new dns.Resolver({ timeout: 1000, tries: 1 });
+  const promiseResolver = new dnsPromises.Resolver({ timeout: 1000, tries: 1 });
+  callbackResolver.setServers([`127.0.0.1:${port}`]);
+  promiseResolver.setServers([`127.0.0.1:${port}`]);
+
+  validateRecords(await promiseResolver.resolveAny(kADomain), 'A');
+  validateRecords(await resolveAny(callbackResolver, kADomain), 'A');
+
+  server.close();
+}));
+
+function createARecords(domain) {
+  return Array.from({ length: kRecordCount }, (_, i) => ({
+    type: 'A',
+    address: `10.0.${i >> 8}.${i & 0xff}`,
+    ttl: 60 + i,
+    domain,
+  }));
+}
+
+function resolveAny(resolver, domain) {
+  return new Promise((resolve) => {
+    resolver.resolveAny(domain, common.mustSucceed(resolve));
+  });
+}
+
+function validateRecords(records, type) {
+  assert.strictEqual(records.length, kRecordCount);
+  for (const record of records) {
+    assert.strictEqual(record.type, type);
+  }
+
+  assert.strictEqual(records[0].ttl, 60);
+  assert.strictEqual(records[255].ttl, 315);
+  assert.strictEqual(records[256].ttl, 316);
+  assert.strictEqual(records[0].address, '10.0.0.0');
+  assert.strictEqual(records[256].address, '10.0.1.0');
+}
diff --git a/test/parallel/test-http-max-headers-count-overflow.js b/test/parallel/test-http-max-headers-count-overflow.js
new file mode 100644
index 00000000000..695195bba32
--- /dev/null
+++ b/test/parallel/test-http-max-headers-count-overflow.js
@@ -0,0 +1,34 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+const net = require('net');
+
+const server = http.createServer(common.mustNotCall());
+
+server.maxHeadersCount = 2;
+
+server.on('clientError', common.mustCall((err, socket) => {
+  assert.strictEqual(err.code, 'HPE_HEADER_OVERFLOW');
+  socket.end('HTTP/1.1 431 Request Header Fields Too Large\r\n\r\n');
+}));
+
+server.listen(0, common.mustCall(() => {
+  const port = server.address().port;
+  const req = 'POST / HTTP/1.1\r\n' +
+              'Host: localhost\r\n' +
+              'X-A: b\r\n' +
+              'Content-Length: 3\r\n' +
+              '\r\nabc';
+
+  net.createConnection(port, 'localhost', common.mustCall(function() {
+    let response = '';
+    this.setEncoding('latin1');
+    this.end(req);
+    this.on('data', (chunk) => response += chunk);
+    this.on('end', common.mustCall(() => {
+      assert.match(response, /^HTTP\/1\.1 431 /);
+      server.close();
+    }));
+  }));
+}));
diff --git a/test/parallel/test-http-max-headers-count.js b/test/parallel/test-http-max-headers-count.js
index 27bb1a1c3c0..5b65b0cb89b 100644
--- a/test/parallel/test-http-max-headers-count.js
+++ b/test/parallel/test-http-max-headers-count.js
@@ -20,7 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const http = require('http');
 
@@ -35,28 +35,38 @@ for (let i = 0; i < N; ++i) {
   headers[`key${i}`] = i;
 }
 
-const maxAndExpected = [ // for server
-  [50, 50],
-  [1500, 102],
-  [0, N + 2], // Host and Connection
+function createRequestHeaders(count) {
+  const requestHeaders = {
+    host: 'example.com',
+  };
+  for (let i = 0; i < count; ++i) {
+    requestHeaders[`key${i}`] = i;
+  }
+  return requestHeaders;
+}
+
+const serverMaxAndExpected = [ // for server
+  [50, 50, 48],
+  [1500, 102, N],
+  [0, N + 2, N], // Host and Connection
 ];
-let max = maxAndExpected[requests][0];
-let expected = maxAndExpected[requests][1];
+let max = serverMaxAndExpected[requests][0];
+let expected = serverMaxAndExpected[requests][1];
 
-const server = http.createServer(function(req, res) {
+const server = http.createServer(common.mustCallAtLeast((req, res) => {
   assert.strictEqual(Object.keys(req.headers).length, expected);
-  if (++requests < maxAndExpected.length) {
-    max = maxAndExpected[requests][0];
-    expected = maxAndExpected[requests][1];
+  if (++requests < serverMaxAndExpected.length) {
+    max = serverMaxAndExpected[requests][0];
+    expected = serverMaxAndExpected[requests][1];
     server.maxHeadersCount = max;
   }
   res.writeHead(200, { ...headers, 'Connection': 'close' });
   res.end();
-});
+}));
 server.maxHeadersCount = max;
 
-server.listen(0, function() {
-  const maxAndExpected = [ // for client
+server.listen(0, common.mustCall(() => {
+  const clientMaxAndExpected = [ // for client
     [20, 20],
     [1200, 104],
     [0, N + 4], // Host and Connection
@@ -64,28 +74,30 @@ server.listen(0, function() {
   doRequest();
 
   function doRequest() {
-    const max = maxAndExpected[responses][0];
-    const expected = maxAndExpected[responses][1];
+    const max = clientMaxAndExpected[responses][0];
+    const expected = clientMaxAndExpected[responses][1];
+    const requestHeaders =
+      createRequestHeaders(serverMaxAndExpected[requests][2]);
     const req = http.request({
       port: server.address().port,
-      headers: headers
-    }, function(res) {
+      headers: requestHeaders
+    }, common.mustCall((res) => {
       assert.strictEqual(Object.keys(res.headers).length, expected);
       res.on('end', function() {
-        if (++responses < maxAndExpected.length) {
+        if (++responses < clientMaxAndExpected.length) {
           doRequest();
         } else {
           server.close();
         }
       });
       res.resume();
-    });
+    }));
     req.maxHeadersCount = max;
     req.end();
   }
-});
+}));
 
 process.on('exit', function() {
-  assert.strictEqual(requests, maxAndExpected.length);
-  assert.strictEqual(responses, maxAndExpected.length);
+  assert.strictEqual(requests, serverMaxAndExpected.length);
+  assert.strictEqual(responses, serverMaxAndExpected.length);
 });
diff --git a/test/parallel/test-http-rawheaders-limit.js b/test/parallel/test-http-rawheaders-limit.js
deleted file mode 100644
index 2adf6c7e527..00000000000
--- a/test/parallel/test-http-rawheaders-limit.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-const common = require('../common');
-const assert = require('assert');
-const http = require('http');
-const net = require('net');
-
-const server = http.createServer(common.mustCall((req, res) => {
-  const limit = server.maxHeadersCount * 2;
-  assert.ok(req.rawHeaders.length <= limit,
-            `rawHeaders.length (${req.rawHeaders.length}) exceeds limit (${limit})`);
-  res.end();
-  server.close();
-}));
-
-server.maxHeadersCount = 50;
-
-server.listen(0, common.mustCall(() => {
-  const port = server.address().port;
-  const headers = Array.from({ length: 65 }, (_, i) => `X-${i}:v`).join('\r\n');
-  const req = `GET / HTTP/1.1\r\nHost: localhost\r\n${headers}\r\n\r\n`;
-
-  net.createConnection(port, 'localhost', function() {
-    this.write(req);
-    this.once('data', () => this.end());
-  });
-}));
diff --git a/test/parallel/test-http2-max-session-memory-stalled-headers.js b/test/parallel/test-http2-max-session-memory-stalled-headers.js
new file mode 100644
index 00000000000..c04bfd09e62
--- /dev/null
+++ b/test/parallel/test-http2-max-session-memory-stalled-headers.js
@@ -0,0 +1,69 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const Countdown = require('../common/countdown');
+const assert = require('assert');
+const http2 = require('http2');
+
+const {
+  NGHTTP2_ENHANCE_YOUR_CALM,
+} = http2.constants;
+
+// Regression test: header blocks retained by stalled streams should continue
+// to count against maxSessionMemory after they have been handed to JS.
+const maxSessionMemory = 1;
+const totalRequests = 400;
+const cookieCrumbs = 120;
+
+let accepted = 0;
+let rejected = 0;
+
+const server = http2.createServer({ maxSessionMemory });
+server.on('stream', (stream) => {
+  accepted++;
+  stream.on('error', () => {});
+  stream.respond();
+  stream.write('x');
+});
+
+server.listen(0, common.mustCall(() => {
+  const client = http2.connect(`http://localhost:${server.address().port}`, {
+    settings: {
+      initialWindowSize: 0,
+    },
+  });
+  client.on('error', () => {});
+
+  client.on('remoteSettings', common.mustCall(() => {
+    let destroyed = false;
+    const countdown = new Countdown(totalRequests, common.mustCall(() => {
+      assert(rejected > 0);
+      assert(accepted < totalRequests);
+      server.close();
+    }));
+
+    for (let i = 0; i < totalRequests; i++) {
+      const headers = [':path', '/'];
+      for (let j = 0; j < cookieCrumbs; j++) {
+        headers.push('cookie', 'a=1');
+      }
+
+      const req = client.request(headers);
+      req.on('error', () => {});
+      req.on('close', () => {
+        if (req.rstCode === NGHTTP2_ENHANCE_YOUR_CALM) {
+          rejected++;
+          if (!destroyed) {
+            destroyed = true;
+            client.destroy();
+          }
+        }
+        countdown.dec();
+      });
+      req.end();
+    }
+  }));
+}));
diff --git a/test/parallel/test-http2-rst-stream-reentrancy.js b/test/parallel/test-http2-rst-stream-reentrancy.js
new file mode 100644
index 00000000000..8added7f940
--- /dev/null
+++ b/test/parallel/test-http2-rst-stream-reentrancy.js
@@ -0,0 +1,68 @@
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const http2 = require('http2');
+const net = require('net');
+
+const PREFACE = Buffer.from('PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n');
+
+function frame(type, flags, sid, payload = Buffer.alloc(0)) {
+  const header = Buffer.alloc(9);
+  header.writeUIntBE(payload.length, 0, 3);
+  header[3] = type;
+  header[4] = flags;
+  header.writeUInt32BE(sid & 0x7fffffff, 5);
+  return Buffer.concat([header, payload]);
+}
+
+function goaway(lastStreamID, code) {
+  const payload = Buffer.alloc(8);
+  payload.writeUInt32BE(lastStreamID, 0);
+  payload.writeUInt32BE(code, 4);
+  return frame(7, 0, 0, payload);
+}
+
+function headers(sid) {
+  return frame(1, 0x05, sid, Buffer.from([
+    0x82,  // :method: GET
+    0x86,  // :scheme: http
+    0x84,  // :path: /
+    0x41, 0x01, 0x78,  // :authority: x
+  ]));
+}
+
+const server = http2.createServer();
+
+server.listen(0, common.mustCall(() => {
+  const socket = net.connect(server.address().port);
+  let sent = false;
+
+  socket.on('connect', common.mustCall(() => {
+    socket.write(Buffer.concat([PREFACE, frame(4, 0, 0)]));
+  }));
+
+  socket.on('error', () => {});
+
+  socket.on('data', common.mustCallAtLeast(() => {
+    if (sent)
+      return;
+    sent = true;
+
+    socket.write(frame(4, 1, 0));
+    socket.write(headers(1));
+
+    setImmediate(() => {
+      socket.write(Buffer.concat([
+        goaway(0, 0),
+        headers(3),
+        headers(5),
+        headers(7),
+      ]));
+      setTimeout(() => socket.destroy(), common.platformTimeout(50));
+    });
+  }));
+
+  socket.on('close', common.mustCall(() => server.close()));
+}));
diff --git a/test/parallel/test-https-agent-checkserveridentity-reuse.js b/test/parallel/test-https-agent-checkserveridentity-reuse.js
new file mode 100644
index 00000000000..2c339c33f9c
--- /dev/null
+++ b/test/parallel/test-https-agent-checkserveridentity-reuse.js
@@ -0,0 +1,113 @@
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const fixtures = require('../common/fixtures');
+const https = require('https');
+const { once } = require('events');
+
+const key = fixtures.readKey('agent1-key.pem');
+const cert = fixtures.readKey('agent1-cert.pem');
+const ca = fixtures.readKey('ca1-cert.pem');
+const expectedError = /rejected by callback/;
+
+function request(options) {
+  return new Promise((resolve, reject) => {
+    const req = https.get({
+      host: '127.0.0.1',
+      servername: 'agent1',
+      ca: [ca],
+      ...options,
+    }, (res) => {
+      const socket = res.socket;
+      res.resume();
+      res.on('end', () => resolve({
+        socket,
+        reusedSocket: req.reusedSocket,
+      }));
+    });
+
+    req.on('error', reject);
+  });
+}
+
+const server = https.createServer({
+  key,
+  cert,
+  minVersion: 'TLSv1.2',
+  maxVersion: 'TLSv1.2',
+}, (req, res) => {
+  res.end('ok');
+});
+
+(async function() {
+  server.listen(0);
+  await once(server, 'listening');
+
+  const port = server.address().port;
+  let acceptCalls = 0;
+  let rejectCalls = 0;
+  const acceptingCheck = () => {
+    acceptCalls++;
+  };
+  const rejectingCheck = () => {
+    rejectCalls++;
+    return new Error('rejected by callback');
+  };
+
+  const sessionAgent = new https.Agent();
+  const keepAliveAgent = new https.Agent({
+    keepAlive: true,
+    maxCachedSessions: 0,
+  });
+  const agentLevelAgent = new https.Agent({
+    checkServerIdentity: acceptingCheck,
+  });
+
+  try {
+    await request({
+      port,
+      agent: sessionAgent,
+      checkServerIdentity: acceptingCheck,
+    });
+    assert.deepStrictEqual(sessionAgent._sessionCache.map, {});
+    await assert.rejects(request({
+      port,
+      agent: sessionAgent,
+      checkServerIdentity: rejectingCheck,
+    }), expectedError);
+
+    await request({
+      port,
+      agent: keepAliveAgent,
+      checkServerIdentity: acceptingCheck,
+    });
+    await assert.rejects(request({
+      port,
+      agent: keepAliveAgent,
+      checkServerIdentity: rejectingCheck,
+    }), expectedError);
+
+    const first = await request({
+      port,
+      agent: agentLevelAgent,
+    });
+    assert.strictEqual(first.socket.isSessionReused(), false);
+    const second = await request({
+      port,
+      agent: agentLevelAgent,
+    });
+    assert.strictEqual(second.socket.isSessionReused(), true);
+
+    assert.strictEqual(acceptCalls, 3);
+    assert.strictEqual(rejectCalls, 2);
+  } finally {
+    sessionAgent.destroy();
+    keepAliveAgent.destroy();
+    agentLevelAgent.destroy();
+    server.close();
+    await once(server, 'close');
+  }
+})().then(common.mustCall());
diff --git a/test/parallel/test-https-agent-getname.js b/test/parallel/test-https-agent-getname.js
index 2a13ab1c6f4..8ead852b1df 100644
--- a/test/parallel/test-https-agent-getname.js
+++ b/test/parallel/test-https-agent-getname.js
@@ -6,6 +6,7 @@ if (!common.hasCrypto)
 
 const assert = require('assert');
 const https = require('https');
+const fixtures = require('../common/fixtures');
 
 const agent = new https.Agent();
 
@@ -52,3 +53,46 @@ assert.strictEqual(
     '::secureProtocol:c,r,l:false:ecdhCurve:dhparam:0:sessionIdContext:' +
     '"sigalgs":privateKeyIdentifier:privateKeyEngine'
 );
+
+{
+  const baseOptions = {
+    host: '0.0.0.0',
+    port: 443,
+  };
+
+  const agent1 = fixtures.readKey('agent1.pfx');
+  const agent6 = fixtures.readKey('agent6.pfx');
+
+  assert.notStrictEqual(
+    agent.getName({
+      ...baseOptions,
+      pfx: [{ buf: agent1, passphrase: 'sample' }],
+    }),
+    agent.getName({
+      ...baseOptions,
+      pfx: [{ buf: agent6, passphrase: 'sample' }],
+    })
+  );
+
+  assert.notStrictEqual(
+    agent.getName({
+      ...baseOptions,
+      pfx: [{ buf: agent1, passphrase: 'sample' }],
+    }),
+    agent.getName({
+      ...baseOptions,
+      pfx: [{ buf: agent1, passphrase: 'different' }],
+    })
+  );
+
+  assert.notStrictEqual(
+    agent.getName({
+      ...baseOptions,
+      pfx: [{ __proto__: { buf: agent1, passphrase: 'sample' } }],
+    }),
+    agent.getName({
+      ...baseOptions,
+      pfx: [{ __proto__: { buf: agent6, passphrase: 'sample' } }],
+    })
+  );
+}
diff --git a/test/parallel/test-https-agent-pfx-object-array-reuse.js b/test/parallel/test-https-agent-pfx-object-array-reuse.js
new file mode 100644
index 00000000000..95134855e97
--- /dev/null
+++ b/test/parallel/test-https-agent-pfx-object-array-reuse.js
@@ -0,0 +1,59 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const https = require('https');
+const fixtures = require('../common/fixtures');
+
+const server = https.createServer({
+  key: fixtures.readKey('agent2-key.pem'),
+  cert: fixtures.readKey('agent2-cert.pem'),
+  requestCert: true,
+  rejectUnauthorized: false,
+}, common.mustCall((req, res) => {
+  res.end(req.socket.getPeerCertificate().subject.CN);
+}, 2));
+
+server.listen(0, common.mustCall(async () => {
+  const agent = new https.Agent({ keepAlive: true, maxSockets: 1 });
+  const port = server.address().port;
+
+  const first = await request({
+    agent,
+    port,
+    pfx: [{ buf: fixtures.readKey('agent1.pfx'), passphrase: 'sample' }],
+  });
+  assert.strictEqual(first.body, 'agent1');
+  assert.strictEqual(first.reusedSocket, false);
+
+  const second = await request({
+    agent,
+    port,
+    pfx: [{ buf: fixtures.readKey('agent10.pfx'), passphrase: 'sample' }],
+  });
+  assert.strictEqual(second.body, 'agent10.example.com');
+  assert.strictEqual(second.reusedSocket, false);
+
+  agent.destroy();
+  server.close();
+}));
+
+function request(options) {
+  return new Promise((resolve, reject) => {
+    const req = https.get({
+      ...options,
+      rejectUnauthorized: false,
+    }, common.mustCall((res) => {
+      let body = '';
+      res.setEncoding('utf8');
+      res.on('data', (chunk) => body += chunk);
+      res.on('end', common.mustCall(() => {
+        resolve({ body, reusedSocket: req.reusedSocket });
+      }));
+    }));
+    req.on('error', reject);
+  });
+}
diff --git a/test/parallel/test-https-max-headers-count.js b/test/parallel/test-https-max-headers-count.js
index 6b188b0780e..8f3f18c1652 100644
--- a/test/parallel/test-https-max-headers-count.js
+++ b/test/parallel/test-https-max-headers-count.js
@@ -24,19 +24,29 @@ for (let i = 0; i < N; ++i) {
   headers[`key${i}`] = i;
 }
 
-const maxAndExpected = [ // for server
-  [50, 50],
-  [1500, 102],
-  [0, N + 2], // Host and Connection
+function createRequestHeaders(count) {
+  const requestHeaders = {
+    host: 'example.com',
+  };
+  for (let i = 0; i < count; ++i) {
+    requestHeaders[`key${i}`] = i;
+  }
+  return requestHeaders;
+}
+
+const serverMaxAndExpected = [ // for server
+  [50, 50, 48],
+  [1500, 102, N],
+  [0, N + 2, N], // Host and Connection
 ];
-let max = maxAndExpected[requests][0];
-let expected = maxAndExpected[requests][1];
+let max = serverMaxAndExpected[requests][0];
+let expected = serverMaxAndExpected[requests][1];
 
 const server = https.createServer(serverOptions, common.mustCall((req, res) => {
   assert.strictEqual(Object.keys(req.headers).length, expected);
-  if (++requests < maxAndExpected.length) {
-    max = maxAndExpected[requests][0];
-    expected = maxAndExpected[requests][1];
+  if (++requests < serverMaxAndExpected.length) {
+    max = serverMaxAndExpected[requests][0];
+    expected = serverMaxAndExpected[requests][1];
     server.maxHeadersCount = max;
   }
   res.writeHead(200, { ...headers, 'Connection': 'close' });
@@ -45,22 +55,24 @@ const server = https.createServer(serverOptions, common.mustCall((req, res) => {
 server.maxHeadersCount = max;
 
 server.listen(0, common.mustCall(() => {
-  const maxAndExpected = [ // for client
+  const clientMaxAndExpected = [ // for client
     [20, 20],
     [1200, 104],
     [0, N + 4], // Host and Connection
   ];
   const doRequest = common.mustCall(() => {
-    const max = maxAndExpected[responses][0];
-    const expected = maxAndExpected[responses][1];
+    const max = clientMaxAndExpected[responses][0];
+    const expected = clientMaxAndExpected[responses][1];
+    const requestHeaders =
+      createRequestHeaders(serverMaxAndExpected[requests][2]);
     const req = https.request({
       port: server.address().port,
-      headers: headers,
+      headers: requestHeaders,
       rejectUnauthorized: false
     }, (res) => {
       assert.strictEqual(Object.keys(res.headers).length, expected);
       res.on('end', () => {
-        if (++responses < maxAndExpected.length) {
+        if (++responses < clientMaxAndExpected.length) {
           doRequest();
         } else {
           server.close();
diff --git a/test/parallel/test-permission-fs-read.js b/test/parallel/test-permission-fs-read.js
index 2388470a0b4..d36776b9496 100644
--- a/test/parallel/test-permission-fs-read.js
+++ b/test/parallel/test-permission-fs-read.js
@@ -15,6 +15,7 @@ if (!common.hasCrypto) {
 const assert = require('assert');
 const fixtures = require('../common/fixtures');
 const tmpdir = require('../common/tmpdir');
+const fs = require('fs');
 const { spawnSync } = require('child_process');
 const path = require('path');
 
@@ -28,6 +29,51 @@ const commonPath = path.join(__filename, '../../common');
   tmpdir.refresh();
 }
 
+{
+  const boundaryFile = path.join(tmpdir.path, 'secret');
+  const grantedFiles = ['secret1', 'secret2', 'secret3']
+    .map((file) => path.join(tmpdir.path, file));
+
+  fs.writeFileSync(boundaryFile, 'protected');
+  for (const file of grantedFiles) {
+    fs.writeFileSync(file, 'granted');
+  }
+
+  const { status, stderr } = spawnSync(
+    process.execPath,
+    [
+      '--permission',
+      ...grantedFiles.map((file) => `--allow-fs-read=${file}`),
+      ...grantedFiles.map((file) => `--allow-fs-write=${file}`),
+      '-e',
+      `
+        const assert = require('assert');
+        const fs = require('fs');
+        const target = process.env.BOUNDARY_FILE;
+
+        assert.strictEqual(process.permission.has('fs.read', target), false);
+        assert.strictEqual(process.permission.has('fs.write', target), false);
+        assert.throws(
+          () => fs.readFileSync(target, 'utf8'),
+          { code: 'ERR_ACCESS_DENIED', permission: 'FileSystemRead' }
+        );
+        assert.throws(
+          () => fs.writeFileSync(target, 'modified'),
+          { code: 'ERR_ACCESS_DENIED', permission: 'FileSystemWrite' }
+        );
+      `,
+    ],
+    {
+      env: {
+        ...process.env,
+        BOUNDARY_FILE: boundaryFile,
+      },
+    }
+  );
+  assert.strictEqual(status, 0, stderr.toString());
+  assert.strictEqual(fs.readFileSync(boundaryFile, 'utf8'), 'protected');
+}
+
 {
   const { status, stderr } = spawnSync(
     process.execPath,
diff --git a/test/parallel/test-permission-fs-write-report.js b/test/parallel/test-permission-fs-write-report.js
index 595f83b2680..728bc4d34c8 100644
--- a/test/parallel/test-permission-fs-write-report.js
+++ b/test/parallel/test-permission-fs-write-report.js
@@ -23,6 +23,7 @@ if (!process.permission) {
 }
 
 const assert = require('assert');
+const fs = require('fs');
 const path = require('path');
 const tmpdir = require('../common/tmpdir');
 
@@ -73,3 +74,67 @@ spawnSyncAndExitWithoutError(
   ],
   { cwd: tmpdir.path }
 );
+
+{
+  const allowedDir = path.join(tmpdir.path, 'report-allowed');
+  const deniedDir = path.join(tmpdir.path, 'report-denied');
+  fs.mkdirSync(allowedDir);
+  fs.mkdirSync(deniedDir);
+
+  const deniedFile = path.join(deniedDir, 'report.json');
+  fs.writeFileSync(deniedFile, 'existing content');
+  spawnSyncAndExitWithoutError(
+    process.execPath,
+    [
+      '--permission',
+      '--allow-fs-read=*',
+      `--allow-fs-write=${allowedDir}`,
+      '-e',
+      `
+      const assert = require('assert');
+      process.report.directory = ${JSON.stringify(deniedDir)};
+      assert.throws(() => {
+        process.report.writeReport('report.json');
+      }, {
+        code: 'ERR_ACCESS_DENIED',
+        permission: 'FileSystemWrite',
+        resource: ${JSON.stringify(deniedFile)},
+      });
+      `,
+    ],
+    { cwd: allowedDir },
+  );
+  assert.strictEqual(fs.readFileSync(deniedFile, 'utf8'), 'existing content');
+}
+
+{
+  const allowedDir = path.join(tmpdir.path, 'report-filename-allowed');
+  const deniedDir = path.join(tmpdir.path, 'report-filename-denied');
+  fs.mkdirSync(allowedDir);
+  fs.mkdirSync(deniedDir);
+
+  const deniedFile = path.join(deniedDir, 'report.json');
+  spawnSyncAndExitWithoutError(
+    process.execPath,
+    [
+      '--permission',
+      '--allow-fs-read=*',
+      `--allow-fs-write=${allowedDir}`,
+      '-e',
+      `
+      const assert = require('assert');
+      process.report.directory = ${JSON.stringify(deniedDir)};
+      process.report.filename = 'report.json';
+      assert.throws(() => {
+        process.report.writeReport();
+      }, {
+        code: 'ERR_ACCESS_DENIED',
+        permission: 'FileSystemWrite',
+        resource: ${JSON.stringify(deniedFile)},
+      });
+      `,
+    ],
+    { cwd: allowedDir },
+  );
+  assert.strictEqual(fs.existsSync(deniedFile), false);
+}
diff --git a/test/parallel/test-permission-fs-write-trace-events.js b/test/parallel/test-permission-fs-write-trace-events.js
new file mode 100644
index 00000000000..66204d498b3
--- /dev/null
+++ b/test/parallel/test-permission-fs-write-trace-events.js
@@ -0,0 +1,70 @@
+// Flags: --expose-internals
+'use strict';
+
+const common = require('../common');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
+const { isMainThread } = require('worker_threads');
+
+if (!isMainThread) {
+  common.skip('This test only works on a main thread');
+}
+
+const assert = require('assert');
+const fs = require('fs');
+const tmpdir = require('../common/tmpdir');
+
+try {
+  require('trace_events');
+} catch {
+  common.skip('missing trace events');
+}
+
+if (!process.permission) {
+  tmpdir.refresh();
+
+  const allowed = tmpdir.resolve('allowed');
+  const outside = tmpdir.resolve('outside');
+  const traceFilePattern = tmpdir.resolve(
+    'outside',
+    // eslint-disable-next-line no-template-curly-in-string
+    'denied-node-trace.${rotation}.log');
+  const traceFile = tmpdir.resolve('outside', 'denied-node-trace.1.log');
+  fs.mkdirSync(allowed);
+  fs.mkdirSync(outside);
+
+  spawnSyncAndExitWithoutError(process.execPath, [
+    '--permission',
+    '--allow-fs-read=*',
+    `--allow-fs-write=${allowed}`,
+    '--trace-event-file-pattern',
+    traceFilePattern,
+    __filename,
+    'child',
+    traceFile,
+  ], { cwd: outside });
+  return;
+}
+
+assert.strictEqual(process.argv[2], 'child');
+const traceFile = process.argv[3];
+
+assert.throws(() => {
+  fs.writeFileSync('canary', 'x');
+}, common.expectsError({
+  code: 'ERR_ACCESS_DENIED',
+  permission: 'FileSystemWrite',
+}));
+
+const tracing = require('trace_events').createTracing({
+  categories: ['node', 'v8', 'node.perf'],
+});
+
+assert.throws(() => {
+  tracing.enable();
+}, common.expectsError({
+  code: 'ERR_ACCESS_DENIED',
+  permission: 'FileSystemWrite',
+  resource: traceFile,
+}));
+
+assert.strictEqual(fs.existsSync(traceFile), false);
diff --git a/test/parallel/test-zlib-invalid-input.js b/test/parallel/test-zlib-invalid-input.js
index 3ec7a15e0bb..721badc13f6 100644
--- a/test/parallel/test-zlib-invalid-input.js
+++ b/test/parallel/test-zlib-invalid-input.js
@@ -52,6 +52,43 @@ nonStringInputs.forEach(common.mustCall((input) => {
   });
 }, nonStringInputs.length));
 
+const spoofedLength = new Uint8Array(1).fill(0x41);
+Object.defineProperty(spoofedLength, 'length', { get: () => 5000 });
+Object.defineProperty(spoofedLength, 'byteLength', { get: () => 5000 });
+
+[
+  zlib.deflateSync,
+  zlib.gzipSync,
+  zlib.deflateRawSync,
+  zlib.unzipSync,
+  zlib.inflateSync,
+  zlib.gunzipSync,
+  zlib.inflateRawSync,
+  zlib.brotliCompressSync,
+  zlib.brotliDecompressSync,
+  zlib.zstdCompressSync,
+  zlib.zstdDecompressSync,
+].forEach((method) => {
+  assert.throws(() => {
+    method(spoofedLength);
+  }, {
+    name: 'RangeError',
+    code: 'ERR_OUT_OF_RANGE',
+  });
+});
+
+{
+  const deflate = zlib.createDeflate();
+  deflate._outOffset = deflate._chunkSize + 1;
+  assert.throws(() => {
+    deflate._processChunk(Buffer.alloc(1), zlib.constants.Z_FINISH);
+  }, {
+    name: 'RangeError',
+    code: 'ERR_OUT_OF_RANGE',
+  });
+  deflate.close();
+}
+
 unzips.forEach(common.mustCall((uz, i) => {
   uz.on('error', common.mustCall());
   uz.on('end', common.mustNotCall());