Skip to content

Commit d58dc8a

Browse files
committed
Merge remote-tracking branch 'upstream/master' into docs-improve-randomUUID
2 parents a9ff3b2 + 6986fa0 commit d58dc8a

Some content is hidden

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

43 files changed

+524
-266
lines changed

CHANGELOG.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ release.
3232
</tr>
3333
<tr>
3434
<td valign="top">
35-
<b><a href="doc/changelogs/CHANGELOG_V15.md#15.13.0">15.13.0</a></b><br/>
35+
<b><a href="doc/changelogs/CHANGELOG_V15.md#15.14.0">15.14.0</a></b><br/>
36+
<a href="doc/changelogs/CHANGELOG_V15.md#15.13.0">15.13.0</a><br/>
3637
<a href="doc/changelogs/CHANGELOG_V15.md#15.12.0">15.12.0</a><br/>
3738
<a href="doc/changelogs/CHANGELOG_V15.md#15.11.0">15.11.0</a><br/>
3839
<a href="doc/changelogs/CHANGELOG_V15.md#15.10.0">15.10.0</a><br/>
@@ -51,7 +52,8 @@ release.
5152
<a href="doc/changelogs/CHANGELOG_V15.md#15.0.0">15.0.0</a><br/>
5253
</td>
5354
<td valign="top">
54-
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.16.0">14.16.0</a></b><br/>
55+
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.16.1">14.16.1</a></b><br/>
56+
<a href="doc/changelogs/CHANGELOG_V14.md#14.16.0">14.16.0</a><br/>
5557
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.5">14.15.5</a><br/>
5658
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.4">14.15.4</a><br/>
5759
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.3">14.15.3</a><br/>
@@ -77,7 +79,8 @@ release.
7779
<a href="doc/changelogs/CHANGELOG_V14.md#14.0.0">14.0.0</a><br/>
7880
</td>
7981
<td valign="top">
80-
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.22.0">12.22.0</a></b><br/>
82+
<b><a href="doc/changelogs/CHANGELOG_V12.md#12.22.1">12.22.1</a></b><br/>
83+
<a href="doc/changelogs/CHANGELOG_V12.md#12.22.0">12.22.0</a><br/>
8184
<a href="doc/changelogs/CHANGELOG_V12.md#12.21.0">12.21.0</a><br/>
8285
<a href="doc/changelogs/CHANGELOG_V12.md#12.20.2">12.20.2</a><br/>
8386
<a href="doc/changelogs/CHANGELOG_V12.md#12.20.1">12.20.1</a><br/>
@@ -118,7 +121,8 @@ release.
118121
<a href="doc/changelogs/CHANGELOG_V12.md#12.0.0">12.0.0</a><br/>
119122
</td>
120123
<td valign="top">
121-
<b><a href="doc/changelogs/CHANGELOG_V10.md#10.24.0">10.24.0</a></b><br/>
124+
<b><a href="doc/changelogs/CHANGELOG_V10.md#10.24.1">10.24.1</a></b><br/>
125+
<a href="doc/changelogs/CHANGELOG_V10.md#10.24.0">10.24.0</a><br/>
122126
<a href="doc/changelogs/CHANGELOG_V10.md#10.23.3">10.23.3</a><br/>
123127
<a href="doc/changelogs/CHANGELOG_V10.md#10.23.2">10.23.2</a><br/>
124128
<a href="doc/changelogs/CHANGELOG_V10.md#10.23.1">10.23.1</a><br/>

doc/api/documentation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ modifications occur. To avoid surprises, use of an Experimental feature may need
5050
a command-line flag. Experimental features may also emit a [warning][].
5151

5252
## Stability overview
53-
<!-- STABILITY_OVERVIEW_SLOT -->
53+
<!-- STABILITY_OVERVIEW_SLOT_BEGIN -->
54+
<!-- STABILITY_OVERVIEW_SLOT_END -->
5455

5556
## JSON output
5657
<!-- YAML

doc/api/domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const d = require('domain').create();
6969
d.on('error', (er) => {
7070
// The error won't crash the process, but what it does is worse!
7171
// Though we've prevented abrupt process restarting, we are leaking
72-
// resources like crazy if this ever happens.
72+
// a lot of resources if this ever happens.
7373
// This is no better than process.on('uncaughtException')!
7474
console.log(`error, but oh well ${er.message}`);
7575
});

doc/api/errors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ made to mark a stream and dependent of itself.
13671367
<a id="ERR_HTTP2_TOO_MANY_INVALID_FRAMES"></a>
13681368
### `ERR_HTTP2_TOO_MANY_INVALID_FRAMES`
13691369
<!--
1370-
added: REPLACEME
1370+
added: v15.14.0
13711371
-->
13721372

13731373
The limit of acceptable invalid HTTP/2 protocol frames sent by the peer,

doc/api/fs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ All the [caveats][] for `fs.watch()` also apply to `fsPromises.watch()`.
12521252
<!-- YAML
12531253
added: v10.0.0
12541254
changes:
1255-
- version: REPLACEME
1255+
- version: v15.14.0
12561256
pr-url: https://github.com/nodejs/node/pull/37490
12571257
description: The `data` argument supports `AsyncIterable`, `Iterable` & `Stream`.
12581258
- version: v15.2.0
@@ -2768,9 +2768,9 @@ changes:
27682768
* `bytesRead` {integer}
27692769
* `buffer` {Buffer}
27702770
2771-
Similar to the `fs.read90` function, this version takes an optional `options`
2772-
object. If no `options` object is specified, it will default with the above
2773-
values.
2771+
Similar to the [`fs.read()`][] function, this version takes an optional
2772+
`options` object. If no `options` object is specified, it will default with the
2773+
above values.
27742774
27752775
### `fs.readdir(path[, options], callback)`
27762776
<!-- YAML

doc/api/http.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2720,7 +2720,7 @@ The `callback` is invoked with a single argument that is an instance of
27202720
JSON fetching example:
27212721

27222722
```js
2723-
http.get('http://nodejs.org/dist/index.json', (res) => {
2723+
http.get('http://localhost:8000/', (res) => {
27242724
const { statusCode } = res;
27252725
const contentType = res.headers['content-type'];
27262726

@@ -2755,6 +2755,16 @@ http.get('http://nodejs.org/dist/index.json', (res) => {
27552755
}).on('error', (e) => {
27562756
console.error(`Got error: ${e.message}`);
27572757
});
2758+
2759+
// Create a local server to receive data from
2760+
const server = http.createServer((req, res) => {
2761+
res.writeHead(200, { 'Content-Type': 'application/json' });
2762+
res.end(JSON.stringify({
2763+
data: 'Hello World!'
2764+
}));
2765+
});
2766+
2767+
server.listen(8000);
27582768
```
27592769

27602770
## `http.globalAgent`

doc/api/net.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ The list of rules added to the blocklist.
138138

139139
## Class: `net.SocketAddress`
140140
<!-- YAML
141-
added: REPLACEME
141+
added: v15.14.0
142142
-->
143143
### `new net.SocketAddress([options])`
144144
<!-- YAML
145-
added: REPLACEME
145+
added: v15.14.0
146146
-->
147147

148148
* `options` {Object}
@@ -155,28 +155,28 @@ added: REPLACEME
155155

156156
### `socketaddress.address`
157157
<!-- YAML
158-
added: REPLACEME
158+
added: v15.14.0
159159
-->
160160

161161
* Type {string}
162162

163163
### `socketaddress.family`
164164
<!-- YAML
165-
added: REPLACEME
165+
added: v15.14.0
166166
-->
167167

168168
* Type {string} Either `'ipv4'` or `'ipv6'`.
169169

170170
### `socketaddress.flowlabel`
171171
<!-- YAML
172-
added: REPLACEME
172+
added: v15.14.0
173173
-->
174174

175175
* Type {number}
176176

177177
### `socketaddress.port`
178178
<!-- YAML
179-
added: REPLACEME
179+
added: v15.14.0
180180
-->
181181

182182
* Type {number}
@@ -543,7 +543,7 @@ it to interact with the client.
543543
<!-- YAML
544544
added: v0.3.4
545545
changes:
546-
- version: REPLACEME
546+
- version: v15.14.0
547547
pr-url: https://github.com/nodejs/node/pull/37735
548548
description: AbortSignal support was added.
549549
-->

doc/api/readline.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ the current position of the cursor down.
544544
<!-- YAML
545545
added: v0.1.98
546546
changes:
547-
- version: REPLACEME
547+
- version: v15.14.0
548548
pr-url: https://github.com/nodejs/node/pull/37932
549549
description: The `signal` option is supported now.
550550
- version: v15.8.0
@@ -638,7 +638,7 @@ will not terminate until it receives `EOF` (<kbd>Ctrl</kbd>+<kbd>D</kbd> on
638638
Linux/macOS, <kbd>Ctrl</kbd>+<kbd>Z</kbd> followed by <kbd>Return</kbd> on
639639
Windows).
640640
If you want your application to exit without waiting for user input, you can
641-
[`unref`][] the standard input stream:
641+
[`unref()`][] the standard input stream:
642642

643643
```js
644644
process.stdin.unref();
@@ -978,5 +978,5 @@ const { createInterface } = require('readline');
978978
[`process.stdin`]: process.md#process_process_stdin
979979
[`process.stdout`]: process.md#process_process_stdout
980980
[`rl.close()`]: #readline_rl_close
981+
[`unref()`]: net.md#net_socket_unref
981982
[reading files]: #readline_example_read_file_stream_line_by_line
982-
[`unref`]: net.md#net_socket_unref

doc/api/worker_threads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ are part of the channel.
527527
<!-- YAML
528528
added: v10.5.0
529529
changes:
530-
- version: REPLACEME
530+
- version: v15.14.0
531531
pr-url: https://github.com/nodejs/node/pull/37917
532532
description: Add 'BlockList' to the list of cloneable types.
533533
- version: v15.9.0

doc/changelogs/CHANGELOG_V10.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</tr>
1212
<tr>
1313
<td valign="top">
14+
<a href="#10.24.1">10.24.1</a><br/>
1415
<a href="#10.24.0">10.24.0</a><br/>
1516
<a href="#10.23.3">10.23.3</a><br/>
1617
<a href="#10.23.2">10.23.2</a><br/>
@@ -75,6 +76,34 @@
7576
* [io.js](CHANGELOG_IOJS.md)
7677
* [Archive](CHANGELOG_ARCHIVE.md)
7778

79+
<a id="10.24.1"></a>
80+
## 2021-04-06, Version 10.24.1 'Dubnium' (LTS), @mylesborins
81+
82+
This is a security release.
83+
84+
### Notable Changes
85+
86+
Vulerabilties fixed:
87+
88+
* **CVE-2021-3450**: OpenSSL - CA certificate check bypass with X509_V_FLAG_X509_STRICT (High)
89+
* This is a vulnerability in OpenSSL which may be exploited through Node.js. You can read more about it in https://www.openssl.org/news/secadv/20210325.txt
90+
* Impacts:
91+
* All versions of the 15.x, 14.x, 12.x and 10.x releases lines
92+
* **CVE-2021-3449**: OpenSSL - NULL pointer deref in signature_algorithms processing (High)
93+
* This is a vulnerability in OpenSSL which may be exploited through Node.js. You can read more about it in https://www.openssl.org/news/secadv/20210325.txt
94+
* Impacts:
95+
* All versions of the 15.x, 14.x, 12.x and 10.x releases lines
96+
* **CVE-2020-7774**: npm upgrade - Update y18n to fix Prototype-Pollution (High)
97+
* This is a vulnerability in the y18n npm module which may be exploited by prototype pollution. You can read more about it in https://github.com/advisories/GHSA-c4w7-xm78-47vh
98+
* Impacts:
99+
* All versions of the 14.x, 12.x and 10.x releases lines
100+
101+
### Commits
102+
103+
* [[`5e526b96ce`](https://github.com/nodejs/node/commit/5e526b96ce)] - **deps**: upgrade npm to 6.14.12 (Ruy Adorno) [#37918](https://github.com/nodejs/node/pull/37918)
104+
* [[`781cb6df5c`](https://github.com/nodejs/node/commit/781cb6df5c)] - **deps**: update archs files for OpenSSL-1.1.1k (Tobias Nießen) [#37940](https://github.com/nodejs/node/pull/37940)
105+
* [[`5db0a05a90`](https://github.com/nodejs/node/commit/5db0a05a90)] - **deps**: upgrade openssl sources to 1.1.1k (Tobias Nießen) [#37940](https://github.com/nodejs/node/pull/37940)
106+
78107
<a id="10.24.0"></a>
79108
## 2021-02-23, Version 10.24.0 'Dubnium' (LTS), @richardlau
80109

0 commit comments

Comments
 (0)