http: use standard args order in IncomingMEssage onError

dnlup · targos · commit 36b4ddd38253 · 2020-12-21T18:24:28.000+01:00
PR-URL: #33035 Refs: #30625 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
@@ -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.
