Skip to content

Commit 0db5875

Browse files
LongTengDaotargos
authored andcommittedApr 22, 2020
lib: fix return type of setTimeout in net.Socket
Function setTimeout in net.Socket should return this, not undefined, as doc said. PR-URL: #32722 Refs: https://nodejs.org/api/net.html#net_socket_settimeout_timeout_callback Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent f302ac9 commit 0db5875

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed
 

‎lib/internal/stream_base_commons.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ function onStreamRead(arrayBuffer) {
233233

234234
function setStreamTimeout(msecs, callback) {
235235
if (this.destroyed)
236-
return;
236+
return this;
237237

238238
this.timeout = msecs;
239239

‎test/parallel/test-net-socket-timeout.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@ for (let i = 0; i < invalidCallbacks.length; i++) {
7070
const server = net.Server();
7171
server.listen(0, common.mustCall(() => {
7272
const socket = net.createConnection(server.address().port);
73-
socket.setTimeout(1, common.mustCall(() => {
74-
socket.destroy();
75-
server.close();
76-
}));
73+
assert.strictEqual(
74+
socket.setTimeout(1, common.mustCall(() => {
75+
socket.destroy();
76+
assert.strictEqual(socket.setTimeout(1, common.mustNotCall()), socket);
77+
server.close();
78+
})),
79+
socket
80+
);
7781
}));

0 commit comments

Comments
 (0)