Skip to content

Commit

Permalink
http2: always call callback on Http2ServerResponse#end
Browse files Browse the repository at this point in the history
Fixes: #28001

PR-URL: #33911
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Denys Otrishko <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
  • Loading branch information
rexagod authored and codebytere committed Jul 14, 2020
1 parent 42ebe7a commit f999907
Showing 2 changed files with 14 additions and 11 deletions.
13 changes: 8 additions & 5 deletions lib/internal/http2/compat.js
Original file line number Diff line number Diff line change
@@ -698,11 +698,6 @@ class Http2ServerResponse extends Stream {
const stream = this[kStream];
const state = this[kState];

if ((state.closed || state.ending) &&
state.headRequest === stream.headRequest) {
return this;
}

if (typeof chunk === 'function') {
cb = chunk;
chunk = null;
@@ -711,6 +706,14 @@ class Http2ServerResponse extends Stream {
encoding = 'utf8';
}

if ((state.closed || state.ending) &&
state.headRequest === stream.headRequest) {
if (typeof cb === 'function') {
process.nextTick(cb);
}
return this;
}

if (chunk !== null && chunk !== undefined)
this.write(chunk, encoding);

12 changes: 6 additions & 6 deletions test/parallel/test-http2-compat-serverresponse-end.js
Original file line number Diff line number Diff line change
@@ -25,16 +25,16 @@ const {
// but callback will only be called once
const server = createServer(mustCall((request, response) => {
response.end('end', 'utf8', mustCall(() => {
response.end(mustNotCall());
response.end(mustCall());
process.nextTick(() => {
response.end(mustNotCall());
response.end(mustCall());
server.close();
});
}));
response.on('finish', mustCall(() => {
response.end(mustNotCall());
response.end(mustCall());
}));
response.end(mustNotCall());
response.end(mustCall());
}));
server.listen(0, mustCall(() => {
let data = '';
@@ -294,7 +294,7 @@ const {
}));
response.end('data', mustCall(() => {
strictEqual(finished, false);
response.end('data', mustNotCall());
response.end('data', mustCall());
}));
}));
server.listen(0, mustCall(() => {
@@ -328,7 +328,7 @@ const {
// Should be able to respond to HEAD with just .end
const server = createServer(mustCall((request, response) => {
response.end('data', mustCall());
response.end(mustNotCall());
response.end(mustCall());
}));
server.listen(0, mustCall(() => {
const { port } = server.address();

0 comments on commit f999907

Please sign in to comment.