Skip to content
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

Jump to bottom

http2: make compat finished match http/1 #24347

Closed
wants to merge 1 commit into from
Closed

http2: make compat finished match http/1 #24347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions lib/internal/http2/compat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,8 @@ class Http2ServerResponse extends Stream {
}

get finished() {
const stream = this[kStream];
return stream.destroyed ||
stream._writableState.ended ||
this[kState].closed;
const state = this[kState];
return state.ending;
}

get socket() {
Expand Down Expand Up @@ -700,12 +698,11 @@ class Http2ServerResponse extends Stream {
if (chunk !== null && chunk !== undefined)
this.write(chunk, encoding);

const isFinished = this.finished;
state.headRequest = stream.headRequest;
state.ending = true;

if (typeof cb === 'function') {
if (isFinished)
if (stream.writableEnded)
this.once('finish', cb);
else
stream.once('finish', cb);
Expand All @@ -714,7 +711,7 @@ class Http2ServerResponse extends Stream {
if (!stream.headersSent)
this.writeHead(this[kState].statusCode);
ronag marked this conversation as resolved.
Show resolved Hide resolved

if (isFinished)
if (this[kState].closed || stream.destroyed)
onStreamCloseResponse.call(stream);
ronag marked this conversation as resolved.
Show resolved Hide resolved
ronag marked this conversation as resolved.
Show resolved Hide resolved
else
stream.end();
Expand Down
4 changes: 3 additions & 1 deletion test/parallel/test-http2-compat-serverresponse-end.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,13 @@ const {
// Http2ServerResponse.end is necessary on HEAD requests in compat
// for http1 compatibility
const server = createServer(mustCall((request, response) => {
strictEqual(response.finished, true);
strictEqual(response.writableEnded, false);
strictEqual(response.finished, false);
response.writeHead(HTTP_STATUS_OK, { foo: 'bar' });
strictEqual(response.finished, false);
response.end('data', mustCall());
strictEqual(response.writableEnded, true);
strictEqual(response.finished, true);
}));
server.listen(0, mustCall(() => {
const { port } = server.address();
Expand Down