fix: Close protocol response streams when aborted (#24014)
This commit is contained in:
parent
bcba4baa85
commit
509740c357
2 changed files with 30 additions and 0 deletions
|
@ -42,6 +42,12 @@ NodeStreamLoader::~NodeStreamLoader() {
|
||||||
node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
|
||||||
node::arraysize(args), args, {0, 0});
|
node::arraysize(args), args, {0, 0});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Destroy the stream if not already ended
|
||||||
|
if (!ended_) {
|
||||||
|
node::MakeCallback(isolate_, emitter_.Get(isolate_), "destroy", 0, nullptr,
|
||||||
|
{0, 0});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
|
void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
|
||||||
|
|
|
@ -440,6 +440,30 @@ describe('protocol module', () => {
|
||||||
ajax(protocolName + '://fake-host');
|
ajax(protocolName + '://fake-host');
|
||||||
await hasEndedPromise;
|
await hasEndedPromise;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('destroys response streams when aborted before completion', async () => {
|
||||||
|
const events = new EventEmitter();
|
||||||
|
registerStreamProtocol(protocolName, (request, callback) => {
|
||||||
|
const responseStream = new stream.PassThrough();
|
||||||
|
responseStream.push('data\r\n');
|
||||||
|
responseStream.on('close', () => {
|
||||||
|
events.emit('close');
|
||||||
|
});
|
||||||
|
callback({
|
||||||
|
statusCode: 200,
|
||||||
|
headers: { 'Content-Type': 'text/plain' },
|
||||||
|
data: responseStream
|
||||||
|
});
|
||||||
|
events.emit('respond');
|
||||||
|
});
|
||||||
|
|
||||||
|
const hasRespondedPromise = emittedOnce(events, 'respond');
|
||||||
|
const hasClosedPromise = emittedOnce(events, 'close');
|
||||||
|
ajax(protocolName + '://fake-host');
|
||||||
|
await hasRespondedPromise;
|
||||||
|
await contents.loadFile(path.join(__dirname, 'fixtures', 'pages', 'jquery.html'));
|
||||||
|
await hasClosedPromise;
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('protocol.isProtocolRegistered', () => {
|
describe('protocol.isProtocolRegistered', () => {
|
||||||
|
|
Loading…
Reference in a new issue