http2: check if stream is not destroyed before sending trailers
Fixes: https://github.com/nodejs/node/issues/22855 PR-URL: https://github.com/nodejs/node/pull/22896 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
311e72fc23
commit
c9d430469c
@ -1464,6 +1464,14 @@ function afterShutdown() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function finishSendTrailers(stream, headersList) {
|
function finishSendTrailers(stream, headersList) {
|
||||||
|
// The stream might be destroyed and in that case
|
||||||
|
// there is nothing to do.
|
||||||
|
// This can happen because finishSendTrailers is
|
||||||
|
// scheduled via setImmediate.
|
||||||
|
if (stream.destroyed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
stream[kState].flags &= ~STREAM_FLAGS_HAS_TRAILERS;
|
stream[kState].flags &= ~STREAM_FLAGS_HAS_TRAILERS;
|
||||||
|
|
||||||
const ret = stream[kHandle].trailers(headersList);
|
const ret = stream[kHandle].trailers(headersList);
|
||||||
|
42
test/parallel/test-http2-compat-socket-destroy-delayed.js
Normal file
42
test/parallel/test-http2-compat-socket-destroy-delayed.js
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
const common = require('../common');
|
||||||
|
const { mustCall } = common;
|
||||||
|
|
||||||
|
if (!common.hasCrypto)
|
||||||
|
common.skip('missing crypto');
|
||||||
|
|
||||||
|
const http2 = require('http2');
|
||||||
|
const assert = require('assert');
|
||||||
|
|
||||||
|
const {
|
||||||
|
HTTP2_HEADER_PATH,
|
||||||
|
HTTP2_HEADER_METHOD,
|
||||||
|
} = http2.constants;
|
||||||
|
|
||||||
|
// This tests verifies that calling `req.socket.destroy()` via
|
||||||
|
// setImmediate does not crash.
|
||||||
|
// Fixes https://github.com/nodejs/node/issues/22855.
|
||||||
|
|
||||||
|
const app = http2.createServer(mustCall((req, res) => {
|
||||||
|
res.end('hello');
|
||||||
|
setImmediate(() => req.socket.destroy());
|
||||||
|
}));
|
||||||
|
|
||||||
|
app.listen(0, mustCall(() => {
|
||||||
|
const session = http2.connect(`http://localhost:${app.address().port}`);
|
||||||
|
const request = session.request({
|
||||||
|
[HTTP2_HEADER_PATH]: '/',
|
||||||
|
[HTTP2_HEADER_METHOD]: 'get'
|
||||||
|
});
|
||||||
|
request.once('response', mustCall((headers, flags) => {
|
||||||
|
let data = '';
|
||||||
|
request.on('data', (chunk) => { data += chunk; });
|
||||||
|
request.on('end', mustCall(() => {
|
||||||
|
assert.strictEqual(data, 'hello');
|
||||||
|
session.close();
|
||||||
|
app.close();
|
||||||
|
}));
|
||||||
|
}));
|
||||||
|
request.end();
|
||||||
|
}));
|
Loading…
x
Reference in New Issue
Block a user