Skip to content

http: response should always emit close on finish #20043

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
trivikr wants to merge 2 commits into from
Closed

http: response should always emit close on finish #20043

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
753ca2b
http: response should always emit close on finish
trivikr Apr 14, 2018
8ffc3c7
fixup: address comments
trivikr Apr 15, 2018
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
20 changes: 12 additions & 8 deletions lib/_http_client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,19 @@ function socketCloseListener() {
// NOTE: It's important to get parser here, because it could be freed by
// the `socketOnData`.
var parser = socket.parser;
if (req.res && req.res.readable) {
// Socket closed before we emitted 'end' below.
if (!req.res.complete) req.res.emit('aborted');
var res = req.res;
res.on('end', function() {
var res = req.res;
Copy link
Copy Markdown
Contributor

@apapirovski apapirovski Apr 15, 2018

Choose a reason for hiding this comment

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

const here.

Copy link
Copy Markdown
Member Author

@trivikr trivikr Apr 15, 2018

Choose a reason for hiding this comment

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

changed in 8ffc3c7

if (res) {
if (res.readable) {
// Socket closed before we emitted 'end' below.
res.emit('aborted');
Copy link
Copy Markdown
Member

@lpinca lpinca Apr 15, 2018

Choose a reason for hiding this comment

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

The !req.res.complete condition is gone, is this wanted?

Copy link
Copy Markdown
Contributor

@apapirovski apapirovski Apr 15, 2018

Choose a reason for hiding this comment

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

No, definitely not.

Copy link
Copy Markdown
Member Author

@trivikr trivikr Apr 15, 2018

Choose a reason for hiding this comment

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

Is there any edit required here?

Copy link
Copy Markdown
Contributor

@apapirovski apapirovski Apr 15, 2018

Choose a reason for hiding this comment

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

It should have if (!req.res.complete) req.res.emit('aborted');. I would check the rest too. There have been changes to that part of code since that original PR was started.

Copy link
Copy Markdown
Member Author

@trivikr trivikr Apr 15, 2018

Choose a reason for hiding this comment

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

Corrected in 8ffc3c7

res.on('end', function() {
this.emit('close');
});
res.push(null);
} else {
res.emit('close');
});
res.push(null);
} else if (!req.res && !req.socket._hadError) {
}
} else if (!req.socket._hadError) {
// This socket error fired before we started to
// receive a response. The error needs to
// fire on the request.
Expand Down
71 changes: 46 additions & 25 deletions test/parallel/test-http-response-close.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,50 @@
const common = require('../common');
const http = require('http');

const server = http.createServer(common.mustCall(function(req, res) {
res.writeHead(200);
res.write('a');
{
const server = http.createServer(
common.mustCall((req, res) => {
res.writeHead(200);
res.write('a');
})
);
server.listen(
0,
common.mustCall(() => {
http.get(
{ port: server.address().port },
common.mustCall((res) => {
res.on('data', common.mustCall(() => {
res.destroy();
}));
res.on('close', common.mustCall(() => {
server.close();
}));
})
);
})
);
}

req.on('close', common.mustCall(function() {
console.error('request aborted');
}));
res.on('close', common.mustCall(function() {
console.error('response aborted');
}));
}));
server.listen(0);

server.on('listening', function() {
console.error('make req');
http.get({
port: this.address().port
}, function(res) {
console.error('got res');
res.on('data', function(data) {
console.error('destroy res');
res.destroy();
server.close();
});
});
});
{
const server = http.createServer(
common.mustCall((req, res) => {
res.writeHead(200);
res.end('a');
})
);
server.listen(
0,
common.mustCall(() => {
http.get(
{ port: server.address().port },
common.mustCall((res) => {
res.on('close', common.mustCall(() => {
server.close();
}));
res.resume();
})
);
})
);
}