http: return this from OutgoingMessage#destroy()

cjihrig · codebytere · commit e1e3ae1567e3 · 2020-06-27T08:58:14.000-07:00
This commit updates OutgoingMessage#destroy() to return `this` for consistency with other writable streams. PR-URL: #32789 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -279,7 +279,7 @@ OutgoingMessage.prototype.setTimeout = function setTimeout(msecs, callback) {
 // it, since something else is destroying this connection anyway.
 OutgoingMessage.prototype.destroy = function destroy(error) {
   if (this.destroyed) {
-    return;
+    return this;
   }
   this.destroyed = true;
 
@@ -290,6 +290,8 @@ OutgoingMessage.prototype.destroy = function destroy(error) {
       socket.destroy(error);
     });
   }
+
+  return this;
 };
 
 
diff --git a/test/parallel/test-outgoing-message-destroy.js b/test/parallel/test-outgoing-message-destroy.js
@@ -0,0 +1,13 @@
+'use strict';
+
+// Test that http.OutgoingMessage,prototype.destroy() returns `this`.
+require('../common');
+
+const assert = require('assert');
+const http = require('http');
+const outgoingMessage = new http.OutgoingMessage();
+
+assert.strictEqual(outgoingMessage.destroyed, false);
+assert.strictEqual(outgoingMessage.destroy(), outgoingMessage);
+assert.strictEqual(outgoingMessage.destroyed, true);
+assert.strictEqual(outgoingMessage.destroy(), outgoingMessage);

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ OutgoingMessage.prototype.setTimeout = function setTimeout(msecs, callback) {`
`279`	`279`	`// it, since something else is destroying this connection anyway.`
`280`	`280`	`OutgoingMessage.prototype.destroy = function destroy(error) {`
`281`	`281`	`if (this.destroyed) {`
`282`		`- return;`
	`282`	`+ return this;`
`283`	`283`	`}`
`284`	`284`	`this.destroyed = true;`
`285`	`285`
`@@ -290,6 +290,8 @@ OutgoingMessage.prototype.destroy = function destroy(error) {`
`290`	`290`	`socket.destroy(error);`
`291`	`291`	`});`
`292`	`292`	`}`
	`293`	`+`
	`294`	`+ return this;`
`293`	`295`	`};`
`294`	`296`
`295`	`297`