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

Revert "src: let http2 streams end after session close" #46249

Closed
wants to merge 4 commits into from
Closed

Revert "src: let http2 streams end after session close" #46249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3619cb3
Revert "src: let http2 streams end after session close"
santigimeno Jan 18, 2023
cceb018
Update test/known_issues/test-http2-trailers-after-session-close.js
Trott Feb 19, 2023
2f640df
Update test/known_issues/test-http2-trailers-after-session-close.js
Trott Feb 19, 2023
f3d066c
Update test/known_issues/test-http2-trailers-after-session-close.js
Trott Feb 19, 2023
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: 0 additions & 11 deletions src/node_http2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,17 +1124,6 @@ int Http2Session::OnStreamClose(nghttp2_session* handle,
if (!stream || stream->is_destroyed())
return 0;

// Don't close synchronously in case there's pending data to be written. This
// may happen when writing trailing headers.
if (code == NGHTTP2_NO_ERROR && nghttp2_session_want_write(handle) &&
env->can_call_into_js()) {
env->SetImmediate([handle, id, code, user_data](Environment* env) {
OnStreamClose(handle, id, code, user_data);
});

return 0;
}

stream->Close(code);

// It is possible for the stream close to occur before the stream is
Expand Down
7 changes: 6 additions & 1 deletion ...est-http2-trailers-after-session-close.js → ...est-http2-trailers-after-session-close.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
'use strict';

// Fixes: https://github.com/nodejs/node/issues/42713
const common = require('../common');
if (!common.hasCrypto)
if (!common.hasCrypto) {
// Remove require('assert').fail when issue is fixed and test
// is moved out of the known_issues directory.
require('assert').fail('missing crypto');
common.skip('missing crypto');
Trott marked this conversation as resolved.
Show resolved Hide resolved
}
const assert = require('assert');
const http2 = require('http2');

Expand Down