mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: Close protocol response streams when aborted (#24657)
Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
@@ -42,6 +42,12 @@ NodeStreamLoader::~NodeStreamLoader() {
|
||||
node::MakeCallback(isolate_, emitter_.Get(isolate_), "removeListener",
|
||||
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) {
|
||||
|
||||
@@ -443,6 +443,30 @@ describe('protocol module', () => {
|
||||
ajax(protocolName + '://fake-host');
|
||||
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.isProtocolHandled', () => {
|
||||
|
||||
Reference in New Issue
Block a user