1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http: use standard args order in IncomingMEssage onError

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/33035
Refs: https://github.com/nodejs/node/issues/30625
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Daniele Belardi 2020-12-11 20:12:58 +01:00 committed by Node.js GitHub Bot
parent f20a88fb86
commit a6bf74eac0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/_http_incoming.js
View File

@ -169,7 +169,7 @@ IncomingMessage.prototype._destroy = function _destroy(err, cb) {
this.emit('aborted');
}
// If aborted and the underlying socket not already destroyed,
// If aborted and the underlying socket is not already destroyed,
// destroy it.
// We have to check if the socket is already destroyed because finished
// does not call the callback when this methdod is invoked from `_http_client`
@ -178,10 +178,10 @@ IncomingMessage.prototype._destroy = function _destroy(err, cb) {
this.socket.destroy(err);
const cleanup = finished(this.socket, (e) => {
cleanup();
onError(this, cb, e || err);
onError(this, e || err, cb);
});
} else {
onError(this, cb, err);
onError(this, err, cb);
}
};
@ -361,7 +361,7 @@ IncomingMessage.prototype._dump = function _dump() {
}
};
function onError(instance, cb, error) {
function onError(instance, error, cb) {
// This is to keep backward compatible behavior.
// An error is emitted only if there are listeners attached to
// the event.