Skip to content

http: emit 'close' when sockets are not constructed #33818

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

Closed
rexagod wants to merge 2 commits into from
Closed

http: emit 'close' when sockets are not constructed #33818

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1a6567
http: emit 'close' when sockets are not constructed
rexagod Jun 9, 2020
304e935
Update lib/_http_outgoing.js
rexagod Jun 14, 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
Next Next commit
http: emit 'close' when sockets are not constructed 
`OutgoingMessage#socket` is `null` for such cases at all times.
Hence, we emit a 'close' event, imitating `destroyImpl.destroy`,
without the socket operations.

Fixes: #33653
  • Loading branch information
@rexagod
rexagod committed Jun 10, 2020
commit b1a6567e25d93693578d05d58c235d3ac9ae6357
5 changes: 5 additions & 0 deletions lib/_http_outgoing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@ OutgoingMessage.prototype.destroy = function destroy(error) {
});
}

if (this instanceof OutgoingMessage) {
Copy link
Copy Markdown
Member

@mcollina mcollina Jun 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this if required?

Copy link
Copy Markdown
Member Author

@rexagod rexagod Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this to check for instances where no sockets were constructed, as in msg = new OutgoingMessage (similar to the code snippet in the original issue #33653).

process.nextTick(() => {
this.emit('close');
});
Comment thread
rexagod marked this conversation as resolved.
Outdated
}
return this;
};

Expand Down
3 changes: 3 additions & 0 deletions test/parallel/test-http-outgoing-destroy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ const OutgoingMessage = http.OutgoingMessage;
assert.strictEqual(msg.destroyed, false);
msg.destroy();
assert.strictEqual(msg.destroyed, true);
msg.on('close', common.mustCall(() => {
assert.strictEqual(msg.destroyed, true);
}));
let callbackCalled = false;
msg.write('asd', common.mustCall((err) => {
assert.strictEqual(err.code, 'ERR_STREAM_DESTROYED');
Expand Down