Skip to content

http: return this from IncomingMessage#destroy() #32789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjihrig merged 3 commits into from
May 9, 2020
Merged

http: return this from IncomingMessage#destroy() #32789

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff6535a
http: return this from IncomingMessage#destroy()
cjihrig Apr 11, 2020
cad76da
http: return this from ClientRequest#destroy()
cjihrig May 9, 2020
94e5b5c
http: return this from OutgoingMessage#destroy()
cjihrig May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
http: return this from OutgoingMessage#destroy() 
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>
  • Loading branch information
@cjihrig
cjihrig committed May 9, 2020
commit 94e5b5c77dade0d8f7358c66144b75c369679cab
4 changes: 3 additions & 1 deletion lib/_http_outgoing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,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;

Expand All @@ -294,6 +294,8 @@ OutgoingMessage.prototype.destroy = function destroy(error) {
socket.destroy(error);
});
}

return this;
};


Expand Down
13 changes: 13 additions & 0 deletions test/parallel/test-outgoing-message-destroy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);