Skip to content

Commit 5579123

Browse files
authored
Merge branch 'nodejs:master' into npm-8.10.0
2 parents de3d246 + fbe1478 commit 5579123

File tree

650 files changed

+9784
-5090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

650 files changed

+9784
-5090
lines changed

.github/CODEOWNERS

-2
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@
107107

108108
/benchmark/misc/startup.js @nodejs/startup
109109
/src/node.cc @nodejs/startup
110-
/src/node_code_cache_stub.cc @nodejs/startup
111110
/src/node_native_module* @nodejs/startup
112111
/lib/internal/bootstrap/* @nodejs/startup
113-
/tools/code_cache/* @nodejs/startup
114112
/tools/snapshot/* @nodejs/startup
115113

116114
# V8

.github/workflows/build-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.event.pull_request.draft == false
3333
strategy:
3434
matrix:
35-
windows: [windows-2019, windows-2022]
35+
windows: [windows-2019]
3636
fail-fast: false
3737
runs-on: ${{ matrix.windows }}
3838
steps:

.github/workflows/coverage-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
jobs:
3434
coverage-windows:
3535
if: github.event.pull_request.draft == false
36-
runs-on: windows-latest
36+
runs-on: windows-2019
3737
steps:
3838
- uses: actions/checkout@v3
3939
with:

.github/workflows/test-asan.yml

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ concurrency:
3030
cancel-in-progress: true
3131

3232
env:
33+
ASAN_OPTIONS: intercept_tls_get_addr=0
3334
PYTHON_VERSION: '3.10'
3435
FLAKY_TESTS: dontcare
3536

.mailmap

+3-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ Hassaan Pasha <pasha.hassaan@gmail.com> <hassaan.pasha@teamo.io>
198198
Hendrik Schwalm <mail@hendrikschwalm.de>
199199
Henry Chin <hheennrryy@gmail.com>
200200
Herbert Vojčík <herby@mailbox.sk>
201-
Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
202-
Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
203201
Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
204202
Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
205203
Igor Savin <iselwin@gmail.com>
@@ -382,6 +380,7 @@ Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
382380
OneNail <OneNail@yeah.net> <onenail@yeah.net>
383381
Onne Gorter <onne@onnlucky.com>
384382
Oscar Martinez <oscar@mtnz-web.com> <oscar.martinez@hautelook.com>
383+
Paolo Insogna <paolo@cowtech.it>
385384
Paul Graham <homosaur@gmail.com> <paul@bytefair.com>
386385
Paul Querna <pquerna@apache.org> <paul@querna.org>
387386
Pedro Lima <pvsousalima@gmail.com>
@@ -564,6 +563,8 @@ Yuta Hiroto <git@about-hiroppy.com>
564563
Zach Bjornson <bjornson@stanford.edu> <zbbjornson@gmail.com>
565564
Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
566565
Zachary Vacura <admin@hackzzila.com>
566+
Zeyu "Alex" Yang <himself65@outlook.com> <himself65@mask.io>
567+
Zeyu "Alex" Yang <himself65@outlook.com> <himself6565@gmail.com>
567568
Zoran Tomicic <ztomicic@gmail.com>
568569
Сковорода Никита Андреевич <chalkerx@gmail.com>
569570
隋鑫磊 <joshuasui@163.com>
+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
'use strict';
2+
3+
const common = require('../common.js');
4+
5+
const {
6+
PerformanceObserver,
7+
performance,
8+
} = require('perf_hooks');
9+
10+
function createTimingInfo({
11+
startTime = 0,
12+
redirectStartTime = 0,
13+
redirectEndTime = 0,
14+
postRedirectStartTime = 0,
15+
finalServiceWorkerStartTime = 0,
16+
finalNetworkRequestStartTime = 0,
17+
finalNetworkResponseStartTime = 0,
18+
endTime = 0,
19+
encodedBodySize = 0,
20+
decodedBodySize = 0,
21+
finalConnectionTimingInfo = null
22+
}) {
23+
if (finalConnectionTimingInfo !== null) {
24+
finalConnectionTimingInfo.domainLookupStartTime =
25+
finalConnectionTimingInfo.domainLookupStartTime || 0;
26+
finalConnectionTimingInfo.domainLookupEndTime =
27+
finalConnectionTimingInfo.domainLookupEndTime || 0;
28+
finalConnectionTimingInfo.connectionStartTime =
29+
finalConnectionTimingInfo.connectionStartTime || 0;
30+
finalConnectionTimingInfo.connectionEndTime =
31+
finalConnectionTimingInfo.connectionEndTime || 0;
32+
finalConnectionTimingInfo.secureConnectionStartTime =
33+
finalConnectionTimingInfo.secureConnectionStartTime || 0;
34+
finalConnectionTimingInfo.ALPNNegotiatedProtocol =
35+
finalConnectionTimingInfo.ALPNNegotiatedProtocol || [];
36+
}
37+
return {
38+
startTime,
39+
redirectStartTime,
40+
redirectEndTime,
41+
postRedirectStartTime,
42+
finalServiceWorkerStartTime,
43+
finalNetworkRequestStartTime,
44+
finalNetworkResponseStartTime,
45+
endTime,
46+
encodedBodySize,
47+
decodedBodySize,
48+
finalConnectionTimingInfo,
49+
};
50+
}
51+
52+
const bench = common.createBenchmark(main, {
53+
n: [1e5],
54+
observe: ['resource'],
55+
});
56+
57+
function test() {
58+
const timingInfo = createTimingInfo({ finalConnectionTimingInfo: {} });
59+
performance.markResourceTiming(
60+
timingInfo,
61+
'http://localhost:8080',
62+
'fetch',
63+
{},
64+
''
65+
);
66+
}
67+
68+
function main({ n, observe }) {
69+
const obs = new PerformanceObserver(() => {
70+
bench.end(n);
71+
});
72+
obs.observe({ entryTypes: [observe], buffered: true });
73+
74+
bench.start();
75+
for (let i = 0; i < 1e5; i++)
76+
test();
77+
}

configure.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ def configure_node(o):
12491249
o['variables']['node_use_node_snapshot'] = b(
12501250
not cross_compiling and not options.shared)
12511251

1252-
if options.without_node_code_cache or options.node_builtin_modules_path:
1252+
if options.without_node_code_cache or options.without_node_snapshot or options.node_builtin_modules_path:
12531253
o['variables']['node_use_node_code_cache'] = 'false'
12541254
else:
12551255
# TODO(refack): fix this when implementing embedded code-cache when cross-compiling.

deps/llhttp/include/llhttp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define LLHTTP_VERSION_MAJOR 6
55
#define LLHTTP_VERSION_MINOR 0
6-
#define LLHTTP_VERSION_PATCH 4
6+
#define LLHTTP_VERSION_PATCH 6
77

88
#ifndef LLHTTP_STRICT_MODE
99
# define LLHTTP_STRICT_MODE 0

deps/openssl/config/archs/BSD-x86/asm/configdata.pm

+61-12
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ our %config = (
156156
],
157157
"dynamic_engines" => "0",
158158
"ex_libs" => [],
159-
"full_version" => "3.0.2+quic",
159+
"full_version" => "3.0.3+quic",
160160
"includes" => [],
161161
"lflags" => [],
162162
"lib_defines" => [
@@ -203,10 +203,10 @@ our %config = (
203203
"openssl_sys_defines" => [],
204204
"openssldir" => "",
205205
"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",
206-
"patch" => "2",
207-
"perl_archname" => "x86_64-linux-thread-multi",
206+
"patch" => "3",
207+
"perl_archname" => "x86_64-linux-gnu-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209-
"perl_version" => "5.34.1",
209+
"perl_version" => "5.30.0",
210210
"perlargv" => [
211211
"no-comp",
212212
"no-shared",
@@ -255,11 +255,11 @@ our %config = (
255255
"prerelease" => "",
256256
"processor" => "",
257257
"rc4_int" => "unsigned int",
258-
"release_date" => "15 Mar 2022",
258+
"release_date" => "3 May 2022",
259259
"shlib_version" => "81.3",
260260
"sourcedir" => ".",
261261
"target" => "BSD-x86",
262-
"version" => "3.0.2"
262+
"version" => "3.0.3"
263263
);
264264
our %target = (
265265
"AR" => "ar",
@@ -1243,6 +1243,9 @@ our %unified_info = (
12431243
"test/evp_libctx_test" => {
12441244
"noinst" => "1"
12451245
},
1246+
"test/evp_pkey_ctx_new_from_name" => {
1247+
"noinst" => "1"
1248+
},
12461249
"test/evp_pkey_dparams_test" => {
12471250
"noinst" => "1"
12481251
},
@@ -1288,6 +1291,9 @@ our %unified_info = (
12881291
"test/lhash_test" => {
12891292
"noinst" => "1"
12901293
},
1294+
"test/localetest" => {
1295+
"noinst" => "1"
1296+
},
12911297
"test/mdc2_internal_test" => {
12921298
"noinst" => "1"
12931299
},
@@ -2890,6 +2896,9 @@ our %unified_info = (
28902896
"doc/html/man3/OPENSSL_secure_malloc.html" => [
28912897
"doc/man3/OPENSSL_secure_malloc.pod"
28922898
],
2899+
"doc/html/man3/OPENSSL_strcasecmp.html" => [
2900+
"doc/man3/OPENSSL_strcasecmp.pod"
2901+
],
28932902
"doc/html/man3/OSSL_CMP_CTX_new.html" => [
28942903
"doc/man3/OSSL_CMP_CTX_new.pod"
28952904
],
@@ -5233,6 +5242,9 @@ our %unified_info = (
52335242
"doc/man/man3/OPENSSL_secure_malloc.3" => [
52345243
"doc/man3/OPENSSL_secure_malloc.pod"
52355244
],
5245+
"doc/man/man3/OPENSSL_strcasecmp.3" => [
5246+
"doc/man3/OPENSSL_strcasecmp.pod"
5247+
],
52365248
"doc/man/man3/OSSL_CMP_CTX_new.3" => [
52375249
"doc/man3/OSSL_CMP_CTX_new.pod"
52385250
],
@@ -7613,6 +7625,9 @@ our %unified_info = (
76137625
"libcrypto.a",
76147626
"test/libtestutil.a"
76157627
],
7628+
"test/evp_pkey_ctx_new_from_name" => [
7629+
"libcrypto"
7630+
],
76167631
"test/evp_pkey_dparams_test" => [
76177632
"libcrypto",
76187633
"test/libtestutil.a"
@@ -7677,6 +7692,10 @@ our %unified_info = (
76777692
"test/libtestutil.a" => [
76787693
"libcrypto"
76797694
],
7695+
"test/localetest" => [
7696+
"libcrypto",
7697+
"test/libtestutil.a"
7698+
],
76807699
"test/mdc2_internal_test" => [
76817700
"libcrypto.a",
76827701
"test/libtestutil.a"
@@ -10484,7 +10503,7 @@ our %unified_info = (
1048410503
"crypto/chacha/chacha-c64xplus.S" => [
1048510504
"crypto/chacha/asm/chacha-c64xplus.pl"
1048610505
],
10487-
"crypto/chacha/chacha-ia64.S" => [
10506+
"crypto/chacha/chacha-ia64.s" => [
1048810507
"crypto/chacha/asm/chacha-ia64.pl"
1048910508
],
1049010509
"crypto/chacha/chacha-ppc.s" => [
@@ -11804,6 +11823,9 @@ our %unified_info = (
1180411823
"doc/html/man3/OPENSSL_secure_malloc.html" => [
1180511824
"doc/man3/OPENSSL_secure_malloc.pod"
1180611825
],
11826+
"doc/html/man3/OPENSSL_strcasecmp.html" => [
11827+
"doc/man3/OPENSSL_strcasecmp.pod"
11828+
],
1180711829
"doc/html/man3/OSSL_CMP_CTX_new.html" => [
1180811830
"doc/man3/OSSL_CMP_CTX_new.pod"
1180911831
],
@@ -14147,6 +14169,9 @@ our %unified_info = (
1414714169
"doc/man/man3/OPENSSL_secure_malloc.3" => [
1414814170
"doc/man3/OPENSSL_secure_malloc.pod"
1414914171
],
14172+
"doc/man/man3/OPENSSL_strcasecmp.3" => [
14173+
"doc/man3/OPENSSL_strcasecmp.pod"
14174+
],
1415014175
"doc/man/man3/OSSL_CMP_CTX_new.3" => [
1415114176
"doc/man3/OSSL_CMP_CTX_new.pod"
1415214177
],
@@ -16435,6 +16460,7 @@ our %unified_info = (
1643516460
"doc/html/man3/OPENSSL_malloc.html",
1643616461
"doc/html/man3/OPENSSL_s390xcap.html",
1643716462
"doc/html/man3/OPENSSL_secure_malloc.html",
16463+
"doc/html/man3/OPENSSL_strcasecmp.html",
1643816464
"doc/html/man3/OSSL_CMP_CTX_new.html",
1643916465
"doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html",
1644016466
"doc/html/man3/OSSL_CMP_ITAV_set0.html",
@@ -18500,6 +18526,10 @@ our %unified_info = (
1850018526
"include",
1850118527
"apps/include"
1850218528
],
18529+
"test/evp_pkey_ctx_new_from_name" => [
18530+
"include",
18531+
"apps/include"
18532+
],
1850318533
"test/evp_pkey_dparams_test" => [
1850418534
"include",
1850518535
"apps/include"
@@ -18687,6 +18717,10 @@ our %unified_info = (
1868718717
"apps/include",
1868818718
"."
1868918719
],
18720+
"test/localetest" => [
18721+
"include",
18722+
"apps/include"
18723+
],
1869018724
"test/mdc2_internal_test" => [
1869118725
".",
1869218726
"include",
@@ -19370,6 +19404,7 @@ our %unified_info = (
1937019404
"doc/man/man3/OPENSSL_malloc.3",
1937119405
"doc/man/man3/OPENSSL_s390xcap.3",
1937219406
"doc/man/man3/OPENSSL_secure_malloc.3",
19407+
"doc/man/man3/OPENSSL_strcasecmp.3",
1937319408
"doc/man/man3/OSSL_CMP_CTX_new.3",
1937419409
"doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3",
1937519410
"doc/man/man3/OSSL_CMP_ITAV_set0.3",
@@ -19992,6 +20027,7 @@ our %unified_info = (
1999220027
"test/evp_fetch_prov_test",
1999320028
"test/evp_kdf_test",
1999420029
"test/evp_libctx_test",
20030+
"test/evp_pkey_ctx_new_from_name",
1999520031
"test/evp_pkey_dparams_test",
1999620032
"test/evp_pkey_provided_test",
1999720033
"test/evp_test",
@@ -20007,6 +20043,7 @@ our %unified_info = (
2000720043
"test/igetest",
2000820044
"test/keymgmt_internal_test",
2000920045
"test/lhash_test",
20046+
"test/localetest",
2001020047
"test/mdc2_internal_test",
2001120048
"test/mdc2test",
2001220049
"test/memleaktest",
@@ -26389,6 +26426,12 @@ our %unified_info = (
2638926426
"test/evp_libctx_test-bin-evp_libctx_test.o" => [
2639026427
"test/evp_libctx_test.c"
2639126428
],
26429+
"test/evp_pkey_ctx_new_from_name" => [
26430+
"test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o"
26431+
],
26432+
"test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [
26433+
"test/evp_pkey_ctx_new_from_name.c"
26434+
],
2639226435
"test/evp_pkey_dparams_test" => [
2639326436
"test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o"
2639426437
],
@@ -26578,6 +26621,12 @@ our %unified_info = (
2657826621
"test/testutil/libtestutil-lib-tests.o",
2657926622
"test/testutil/libtestutil-lib-testutil_init.o"
2658026623
],
26624+
"test/localetest" => [
26625+
"test/localetest-bin-localetest.o"
26626+
],
26627+
"test/localetest-bin-localetest.o" => [
26628+
"test/localetest.c"
26629+
],
2658126630
"test/mdc2_internal_test" => [
2658226631
"test/mdc2_internal_test-bin-mdc2_internal_test.o"
2658326632
],
@@ -27290,8 +27339,8 @@ unless (caller) {
2729027339
use File::Copy;
2729127340
use Pod::Usage;
2729227341

27293-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27294-
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';
27342+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
27343+
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
2729527344

2729627345
my $here = dirname($0);
2729727346

@@ -27318,7 +27367,7 @@ unless (caller) {
2731827367
);
2731927368

2732027369
use lib '.';
27321-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
27370+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
2732227371
use gentemplate;
2732327372

2732427373
print 'Creating ',$buildfile_template,"\n";
@@ -27335,8 +27384,8 @@ unless (caller) {
2733527384

2733627385
my $prepend = <<'_____';
2733727386
use File::Spec::Functions;
27338-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
27339-
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
27387+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
27388+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
2734027389
use lib '.';
2734127390
use platform;
2734227391
_____

0 commit comments

Comments
 (0)