Merge branch 'nodejs:main' into diangogav/test-tls-check-server-identity-coverage

Author: diangogav

CHANGELOG.md

@@ -53,7 +53,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V24.md#24.0.0">24.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V22.md#22.19.0">22.19.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V22.md#22.20.0">22.20.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V22.md#22.19.0">22.19.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.18.0">22.18.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.17.1">22.17.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V22.md#22.17.0">22.17.0</a><br/>

benchmark/dgram/offset-length.js

@@ -5,28 +5,28 @@ const common = require('../common.js');
 const dgram = require('dgram');
 const PORT = common.PORT;
 
-// `num` is the number of send requests to queue up each time.
+// `n` is the number of send requests to queue up each time.
 // Keep it reasonably high (>10) otherwise you're benchmarking the speed of
 // event loop cycles more than anything else.
 const bench = common.createBenchmark(main, {
-  len: [1, 64, 256, 1024],
-  num: [100],
+  len: [1, 512, 1024],
+  n: [100],
   type: ['send', 'recv'],
   dur: [5],
 });
 
-function main({ dur, len, num, type }) {
+function main({ dur, len, n, type }) {
   const chunk = Buffer.allocUnsafe(len);
   let sent = 0;
   let received = 0;
   const socket = dgram.createSocket('udp4');
 
   function onsend() {
-    if (sent++ % num === 0) {
+    if (sent++ % n === 0) {
       // The setImmediate() is necessary to have event loop progress on OSes
       // that only perform synchronous I/O on nonblocking UDP sockets.
       setImmediate(() => {
-        for (let i = 0; i < num; i++) {
+        for (let i = 0; i < n; i++) {
           socket.send(chunk, 0, chunk.length, PORT, '127.0.0.1', onsend);
         }
       });

benchmark/dgram/single-buffer.js

@@ -10,23 +10,23 @@ const PORT = common.PORT;
 // event loop cycles more than anything else.
 const bench = common.createBenchmark(main, {
   len: [1, 64, 256, 1024],
-  num: [100],
+  n: [100],
   type: ['send', 'recv'],
   dur: [5],
 });
 
-function main({ dur, len, num, type }) {
+function main({ dur, len, num: n, type }) {
   const chunk = Buffer.allocUnsafe(len);
   let sent = 0;
   let received = 0;
   const socket = dgram.createSocket('udp4');
 
   function onsend() {
-    if (sent++ % num === 0) {
+    if (sent++ % n === 0) {
       // The setImmediate() is necessary to have event loop progress on OSes
       // that only perform synchronous I/O on nonblocking UDP sockets.
       setImmediate(() => {
-        for (let i = 0; i < num; i++) {
+        for (let i = 0; i < n; i++) {
           socket.send(chunk, PORT, '127.0.0.1', onsend);
         }
       });

benchmark/permission/permission-startup.js

@@ -19,12 +19,12 @@ const bench = common.createBenchmark(main, {
   ],
   prefixPath: ['/tmp'],
   nFiles: [10, 100, 1000],
-  count: [30],
+  n: [30],
 });
 
 function spawnProcess(script, bench, state) {
   const cmd = process.execPath || process.argv[0];
-  while (state.finished < state.count) {
+  while (state.finished < state.n) {
     const child = spawnSync(cmd, script);
     if (child.status !== 0) {
       console.log('---- STDOUT ----');
@@ -39,13 +39,13 @@ function spawnProcess(script, bench, state) {
       bench.start();
     }
 
-    if (state.finished === state.count) {
-      bench.end(state.count);
+    if (state.finished === state.n) {
+      bench.end(state.n);
     }
   }
 }
 
-function main({ count, script, nFiles, prefixPath }) {
+function main({ n, script, nFiles, prefixPath }) {
   script = path.resolve(__dirname, '../../', `${script}.js`);
   const optionsWithScript = [
     '--permission',
@@ -54,6 +54,6 @@ function main({ count, script, nFiles, prefixPath }) {
     script,
   ];
   const warmup = 3;
-  const state = { count, finished: -warmup };
+  const state = { n, finished: -warmup };
   spawnProcess(optionsWithScript, bench, state);
 }

benchmark/util/priority-queue.js

@@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, {
   n: [1e5],
 }, { flags: ['--expose-internals'] });
 
-function main({ n, type }) {
+function main({ n }) {
   const PriorityQueue = require('internal/priority_queue');
   const queue = new PriorityQueue();
   bench.start();

doc/api/cli.md

@@ -659,7 +659,9 @@ added:
   - v23.7.0
   - v22.14.0
 changes:
-  - version: v24.8.0
+  - version:
+    - v24.8.0
+    - v22.20.0
     pr-url: https://github.com/nodejs/node/pull/59707
     description: The option is no longer experimental.
 -->
@@ -981,7 +983,9 @@ It is possible to run code containing inline types unless the
 ### `--experimental-addon-modules`
 
 <!-- YAML
-added: v23.6.0
+added:
+  - v23.6.0
+  - v22.20.0
 -->
 
 > Stability: 1.0 - Early development

doc/api/deprecations.md

@@ -3403,7 +3403,9 @@ Convert them to primitive strings.
 
 <!-- YAML
 changes:
-  - version: v24.8.0
+  - version:
+    - v24.8.0
+    - v22.20.0
     pr-url: https://github.com/nodejs/node/pull/59758
     description: Deprecation revoked.
   - version:

doc/api/diagnostics_channel.md

@@ -374,7 +374,9 @@ added:
  - v15.1.0
  - v14.17.0
 changes:
-  - version: v24.8.0
+  - version:
+    - v24.8.0
+    - v22.20.0
     pr-url: https://github.com/nodejs/node/pull/59758
     description: Deprecation revoked.
   - version:
@@ -419,7 +421,9 @@ added:
  - v15.1.0
  - v14.17.0
 changes:
-  - version: v24.8.0
+  - version:
+    - v24.8.0
+    - v22.20.0
     pr-url: https://github.com/nodejs/node/pull/59758
     description: Deprecation revoked.
   - version:

doc/api/errors.md

@@ -831,7 +831,9 @@ size is reached when the context is created.
 ### `ERR_CPU_PROFILE_ALREADY_STARTED`
 
 <!-- YAML
-added: v24.8.0
+added:
+  - v24.8.0
+  - v22.20.0
 -->
 
 The CPU profile with the given name is already started.
@@ -841,7 +843,9 @@ The CPU profile with the given name is already started.
 ### `ERR_CPU_PROFILE_NOT_STARTED`
 
 <!-- YAML
-added: v24.8.0
+added:
+  - v24.8.0
+  - v22.20.0
 -->
 
 The CPU profile with the given name is not started.
@@ -851,7 +855,9 @@ The CPU profile with the given name is not started.
 ### `ERR_CPU_PROFILE_TOO_MANY`
 
 <!-- YAML
-added: v24.8.0
+added:
+  - v24.8.0
+  - v22.20.0
 -->
 
 There are too many CPU profiles being collected.

doc/api/globals.md

@@ -330,7 +330,9 @@ with the [`--no-experimental-websocket`][] CLI flag.
 <!-- YAML
 added: v18.0.0
 changes:
- - version: v24.7.0
+ - version:
+   - v24.7.0
+   - v22.20.0
    pr-url: https://github.com/nodejs/node/pull/59464
    description: format now accepts `brotli` value.
  - version:
@@ -448,14 +450,16 @@ A browser-compatible implementation of {CustomEvent}.
 <!-- YAML
 added: v18.0.0
 changes:
- - version: v24.7.0
-   pr-url: https://github.com/nodejs/node/pull/59464
-   description: format now accepts `brotli` value.
- - version:
+  - version:
+    - v24.7.0
+    - v22.20.0
+    pr-url: https://github.com/nodejs/node/pull/59464
+    description: format now accepts `brotli` value.
+  - version:
     - v23.11.0
     - v22.15.0
-   pr-url: https://github.com/nodejs/node/pull/57510
-   description: Marking the API stable.
+    pr-url: https://github.com/nodejs/node/pull/57510
+    description: Marking the API stable.
 -->
 
 A browser-compatible implementation of [`DecompressionStream`][].