Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
http2: use original error for cancelling pending streams
Previously, if `session.destroy()` was called with an error object,
the information contained in it would be discarded and a generic
`ERR_HTTP2_STREAM_CANCEL` would be used for all pending streams.

Instead, make the information from the original error object
available.
  • Loading branch information
addaleax committed Feb 25, 2018
commit 97cb4a711ca9c178e915ae8d9fcd7a6e3bc0318c
5 changes: 5 additions & 0 deletions lib/internal/http2/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,11 @@ class Http2Session extends EventEmitter {

// Destroy any pending and open streams
const cancel = new errors.Error('ERR_HTTP2_STREAM_CANCEL');
if (error) {
cancel.cause = error;
if (typeof error.message === 'string')
cancel.message += ` (caused by: ${error.message})`;
}
state.pendingStreams.forEach((stream) => stream.destroy(cancel));
state.streams.forEach((stream) => stream.destroy(error));

Expand Down
11 changes: 8 additions & 3 deletions test/parallel/test-http2-client-onconnect-errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,14 @@ function runTest(test) {
req.on('error', errorMustCall);
} else {
client.on('error', errorMustCall);
req.on('error', common.expectsError({
code: 'ERR_HTTP2_STREAM_CANCEL'
}));
req.on('error', (err) => {
common.expectsError({
code: 'ERR_HTTP2_STREAM_CANCEL'
})(err);
common.expectsError({
code: 'ERR_HTTP2_ERROR'
})(err.cause);
});
}

req.on('end', common.mustCall());
Expand Down