Merge branch 'nodejs:master' into npm-8.10.0

nodejs · May 17, 2022 · 5579123 · 5579123
2 parents de3d246 + fbe1478
commit 5579123
Show file tree

Hide file tree

Showing 650 changed files with 9,784 additions and 5,090 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -107,10 +107,8 @@
 
 /benchmark/misc/startup.js @nodejs/startup
 /src/node.cc @nodejs/startup
-/src/node_code_cache_stub.cc @nodejs/startup
 /src/node_native_module* @nodejs/startup
 /lib/internal/bootstrap/* @nodejs/startup
-/tools/code_cache/* @nodejs/startup
 /tools/snapshot/* @nodejs/startup
 
 # V8

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -32,7 +32,7 @@ jobs:
     if: github.event.pull_request.draft == false
     strategy:
       matrix:
-        windows: [windows-2019, windows-2022]
+        windows: [windows-2019]
       fail-fast: false
     runs-on: ${{ matrix.windows }}
     steps:

diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml
@@ -33,7 +33,7 @@ env:
 jobs:
   coverage-windows:
     if: github.event.pull_request.draft == false
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml
@@ -30,6 +30,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  ASAN_OPTIONS: intercept_tls_get_addr=0
   PYTHON_VERSION: '3.10'
   FLAKY_TESTS: dontcare
 

diff --git a/.mailmap b/.mailmap
@@ -198,8 +198,6 @@ Hassaan Pasha <pasha.hassaan@gmail.com> <hassaan.pasha@teamo.io>
 Hendrik Schwalm <mail@hendrikschwalm.de>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
-Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
-Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
 Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
 Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
 Igor Savin <iselwin@gmail.com>
@@ -382,6 +380,7 @@ Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
 OneNail <OneNail@yeah.net> <onenail@yeah.net>
 Onne Gorter <onne@onnlucky.com>
 Oscar Martinez <oscar@mtnz-web.com> <oscar.martinez@hautelook.com>
+Paolo Insogna <paolo@cowtech.it>
 Paul Graham <homosaur@gmail.com> <paul@bytefair.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
 Pedro Lima <pvsousalima@gmail.com>
@@ -564,6 +563,8 @@ Yuta Hiroto <git@about-hiroppy.com>
 Zach Bjornson <bjornson@stanford.edu> <zbbjornson@gmail.com>
 Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
 Zachary Vacura <admin@hackzzila.com>
+Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
+Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
 Zoran Tomicic <ztomicic@gmail.com>
 Сковорода Никита Андреевич <chalkerx@gmail.com>
 隋鑫磊 <joshuasui@163.com>
diff --git a/benchmark/perf_hooks/resourcetiming.js b/benchmark/perf_hooks/resourcetiming.js
@@ -0,0 +1,77 @@
+'use strict';
+
+const common = require('../common.js');
+
+const {
+  PerformanceObserver,
+  performance,
+} = require('perf_hooks');
+
+function createTimingInfo({
+  startTime = 0,
+  redirectStartTime = 0,
+  redirectEndTime = 0,
+  postRedirectStartTime = 0,
+  finalServiceWorkerStartTime = 0,
+  finalNetworkRequestStartTime = 0,
+  finalNetworkResponseStartTime = 0,
+  endTime = 0,
+  encodedBodySize = 0,
+  decodedBodySize = 0,
+  finalConnectionTimingInfo = null
+}) {
+  if (finalConnectionTimingInfo !== null) {
+    finalConnectionTimingInfo.domainLookupStartTime =
+        finalConnectionTimingInfo.domainLookupStartTime || 0;
+    finalConnectionTimingInfo.domainLookupEndTime =
+        finalConnectionTimingInfo.domainLookupEndTime || 0;
+    finalConnectionTimingInfo.connectionStartTime =
+        finalConnectionTimingInfo.connectionStartTime || 0;
+    finalConnectionTimingInfo.connectionEndTime =
+        finalConnectionTimingInfo.connectionEndTime || 0;
+    finalConnectionTimingInfo.secureConnectionStartTime =
+        finalConnectionTimingInfo.secureConnectionStartTime || 0;
+    finalConnectionTimingInfo.ALPNNegotiatedProtocol =
+        finalConnectionTimingInfo.ALPNNegotiatedProtocol || [];
+  }
+  return {
+    startTime,
+    redirectStartTime,
+    redirectEndTime,
+    postRedirectStartTime,
+    finalServiceWorkerStartTime,
+    finalNetworkRequestStartTime,
+    finalNetworkResponseStartTime,
+    endTime,
+    encodedBodySize,
+    decodedBodySize,
+    finalConnectionTimingInfo,
+  };
+}
+
+const bench = common.createBenchmark(main, {
+  n: [1e5],
+  observe: ['resource'],
+});
+
+function test() {
+  const timingInfo = createTimingInfo({ finalConnectionTimingInfo: {} });
+  performance.markResourceTiming(
+    timingInfo,
+    'http://localhost:8080',
+    'fetch',
+    {},
+    ''
+  );
+}
+
+function main({ n, observe }) {
+  const obs = new PerformanceObserver(() => {
+    bench.end(n);
+  });
+  obs.observe({ entryTypes: [observe], buffered: true });
+
+  bench.start();
+  for (let i = 0; i < 1e5; i++)
+    test();
+}
diff --git a/configure.py b/configure.py
@@ -1249,7 +1249,7 @@ def configure_node(o):
     o['variables']['node_use_node_snapshot'] = b(
       not cross_compiling and not options.shared)
 
-  if options.without_node_code_cache or options.node_builtin_modules_path:
+  if options.without_node_code_cache or options.without_node_snapshot or options.node_builtin_modules_path:
     o['variables']['node_use_node_code_cache'] = 'false'
   else:
     # TODO(refack): fix this when implementing embedded code-cache when cross-compiling.

diff --git a/deps/llhttp/include/llhttp.h b/deps/llhttp/include/llhttp.h
@@ -3,7 +3,7 @@
 
 #define LLHTTP_VERSION_MAJOR 6
 #define LLHTTP_VERSION_MINOR 0
-#define LLHTTP_VERSION_PATCH 4
+#define LLHTTP_VERSION_PATCH 6
 
 #ifndef LLHTTP_STRICT_MODE
 # define LLHTTP_STRICT_MODE 0

diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm
@@ -156,7 +156,7 @@ our %config = (
     ],
     "dynamic_engines" => "0",
     "ex_libs" => [],
-    "full_version" => "3.0.2+quic",
+    "full_version" => "3.0.3+quic",
     "includes" => [],
     "lflags" => [],
     "lib_defines" => [
@@ -203,10 +203,10 @@ our %config = (
     "openssl_sys_defines" => [],
     "openssldir" => "",
     "options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
-    "patch" => "2",
-    "perl_archname" => "x86_64-linux-thread-multi",
+    "patch" => "3",
+    "perl_archname" => "x86_64-linux-gnu-thread-multi",
     "perl_cmd" => "/usr/bin/perl",
-    "perl_version" => "5.34.1",
+    "perl_version" => "5.30.0",
     "perlargv" => [
         "no-comp",
         "no-shared",
@@ -255,11 +255,11 @@ our %config = (
     "prerelease" => "",
     "processor" => "",
     "rc4_int" => "unsigned int",
-    "release_date" => "15 Mar 2022",
+    "release_date" => "3 May 2022",
     "shlib_version" => "81.3",
     "sourcedir" => ".",
     "target" => "BSD-x86",
-    "version" => "3.0.2"
+    "version" => "3.0.3"
 );
 our %target = (
     "AR" => "ar",
@@ -1243,6 +1243,9 @@ our %unified_info = (
             "test/evp_libctx_test" => {
                 "noinst" => "1"
             },
+            "test/evp_pkey_ctx_new_from_name" => {
+                "noinst" => "1"
+            },
             "test/evp_pkey_dparams_test" => {
                 "noinst" => "1"
             },
@@ -1288,6 +1291,9 @@ our %unified_info = (
             "test/lhash_test" => {
                 "noinst" => "1"
             },
+            "test/localetest" => {
+                "noinst" => "1"
+            },
             "test/mdc2_internal_test" => {
                 "noinst" => "1"
             },
@@ -2890,6 +2896,9 @@ our %unified_info = (
         "doc/html/man3/OPENSSL_secure_malloc.html" => [
             "doc/man3/OPENSSL_secure_malloc.pod"
         ],
+        "doc/html/man3/OPENSSL_strcasecmp.html" => [
+            "doc/man3/OPENSSL_strcasecmp.pod"
+        ],
         "doc/html/man3/OSSL_CMP_CTX_new.html" => [
             "doc/man3/OSSL_CMP_CTX_new.pod"
         ],
@@ -5233,6 +5242,9 @@ our %unified_info = (
         "doc/man/man3/OPENSSL_secure_malloc.3" => [
             "doc/man3/OPENSSL_secure_malloc.pod"
         ],
+        "doc/man/man3/OPENSSL_strcasecmp.3" => [
+            "doc/man3/OPENSSL_strcasecmp.pod"
+        ],
         "doc/man/man3/OSSL_CMP_CTX_new.3" => [
             "doc/man3/OSSL_CMP_CTX_new.pod"
         ],
@@ -7613,6 +7625,9 @@ our %unified_info = (
             "libcrypto.a",
             "test/libtestutil.a"
         ],
+        "test/evp_pkey_ctx_new_from_name" => [
+            "libcrypto"
+        ],
         "test/evp_pkey_dparams_test" => [
             "libcrypto",
             "test/libtestutil.a"
@@ -7677,6 +7692,10 @@ our %unified_info = (
         "test/libtestutil.a" => [
             "libcrypto"
         ],
+        "test/localetest" => [
+            "libcrypto",
+            "test/libtestutil.a"
+        ],
         "test/mdc2_internal_test" => [
             "libcrypto.a",
             "test/libtestutil.a"
@@ -10484,7 +10503,7 @@ our %unified_info = (
         "crypto/chacha/chacha-c64xplus.S" => [
             "crypto/chacha/asm/chacha-c64xplus.pl"
         ],
-        "crypto/chacha/chacha-ia64.S" => [
+        "crypto/chacha/chacha-ia64.s" => [
             "crypto/chacha/asm/chacha-ia64.pl"
         ],
         "crypto/chacha/chacha-ppc.s" => [
@@ -11804,6 +11823,9 @@ our %unified_info = (
         "doc/html/man3/OPENSSL_secure_malloc.html" => [
             "doc/man3/OPENSSL_secure_malloc.pod"
         ],
+        "doc/html/man3/OPENSSL_strcasecmp.html" => [
+            "doc/man3/OPENSSL_strcasecmp.pod"
+        ],
         "doc/html/man3/OSSL_CMP_CTX_new.html" => [
             "doc/man3/OSSL_CMP_CTX_new.pod"
         ],
@@ -14147,6 +14169,9 @@ our %unified_info = (
         "doc/man/man3/OPENSSL_secure_malloc.3" => [
             "doc/man3/OPENSSL_secure_malloc.pod"
         ],
+        "doc/man/man3/OPENSSL_strcasecmp.3" => [
+            "doc/man3/OPENSSL_strcasecmp.pod"
+        ],
         "doc/man/man3/OSSL_CMP_CTX_new.3" => [
             "doc/man3/OSSL_CMP_CTX_new.pod"
         ],
@@ -16435,6 +16460,7 @@ our %unified_info = (
             "doc/html/man3/OPENSSL_malloc.html",
             "doc/html/man3/OPENSSL_s390xcap.html",
             "doc/html/man3/OPENSSL_secure_malloc.html",
+            "doc/html/man3/OPENSSL_strcasecmp.html",
             "doc/html/man3/OSSL_CMP_CTX_new.html",
             "doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html",
             "doc/html/man3/OSSL_CMP_ITAV_set0.html",
@@ -18500,6 +18526,10 @@ our %unified_info = (
             "include",
             "apps/include"
         ],
+        "test/evp_pkey_ctx_new_from_name" => [
+            "include",
+            "apps/include"
+        ],
         "test/evp_pkey_dparams_test" => [
             "include",
             "apps/include"
@@ -18687,6 +18717,10 @@ our %unified_info = (
             "apps/include",
             "."
         ],
+        "test/localetest" => [
+            "include",
+            "apps/include"
+        ],
         "test/mdc2_internal_test" => [
             ".",
             "include",
@@ -19370,6 +19404,7 @@ our %unified_info = (
             "doc/man/man3/OPENSSL_malloc.3",
             "doc/man/man3/OPENSSL_s390xcap.3",
             "doc/man/man3/OPENSSL_secure_malloc.3",
+            "doc/man/man3/OPENSSL_strcasecmp.3",
             "doc/man/man3/OSSL_CMP_CTX_new.3",
             "doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3",
             "doc/man/man3/OSSL_CMP_ITAV_set0.3",
@@ -19992,6 +20027,7 @@ our %unified_info = (
         "test/evp_fetch_prov_test",
         "test/evp_kdf_test",
         "test/evp_libctx_test",
+        "test/evp_pkey_ctx_new_from_name",
         "test/evp_pkey_dparams_test",
         "test/evp_pkey_provided_test",
         "test/evp_test",
@@ -20007,6 +20043,7 @@ our %unified_info = (
         "test/igetest",
         "test/keymgmt_internal_test",
         "test/lhash_test",
+        "test/localetest",
         "test/mdc2_internal_test",
         "test/mdc2test",
         "test/memleaktest",
@@ -26389,6 +26426,12 @@ our %unified_info = (
         "test/evp_libctx_test-bin-evp_libctx_test.o" => [
             "test/evp_libctx_test.c"
         ],
+        "test/evp_pkey_ctx_new_from_name" => [
+            "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o"
+        ],
+        "test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [
+            "test/evp_pkey_ctx_new_from_name.c"
+        ],
         "test/evp_pkey_dparams_test" => [
             "test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o"
         ],
@@ -26578,6 +26621,12 @@ our %unified_info = (
             "test/testutil/libtestutil-lib-tests.o",
             "test/testutil/libtestutil-lib-testutil_init.o"
         ],
+        "test/localetest" => [
+            "test/localetest-bin-localetest.o"
+        ],
+        "test/localetest-bin-localetest.o" => [
+            "test/localetest.c"
+        ],
         "test/mdc2_internal_test" => [
             "test/mdc2_internal_test-bin-mdc2_internal_test.o"
         ],
@@ -27290,8 +27339,8 @@ unless (caller) {
     use File::Copy;
     use Pod::Usage;
 
-    use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
-    use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
+    use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
+    use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
 
     my $here = dirname($0);
 
@@ -27318,7 +27367,7 @@ unless (caller) {
             );
 
         use lib '.';
-        use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
+        use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
         use gentemplate;
 
         print 'Creating ',$buildfile_template,"\n";
@@ -27335,8 +27384,8 @@ unless (caller) {
 
         my $prepend = <<'_____';
 use File::Spec::Functions;
-use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
-use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
+use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
+use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
 use lib '.';
 use platform;
 _____