Skip to content

src: fix StreamPipe cleanup & interaction with env handles #26256

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

Closed
addaleax wants to merge 2 commits into from
Closed

src: fix StreamPipe cleanup & interaction with env handles #26256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b937eb
src: do not access Environment-owned handles after cleanup
addaleax Feb 21, 2019
c43d20b
src: clean up `StreamPipe` in destructor
addaleax Feb 21, 2019
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
Prev Previous commit
src: clean up StreamPipe in destructor 
In the presence of Workers, it is not safe to assume that
`StreamPipe::Unpipe()` has been called at the time when the object
is destroyed.

Instead, clean up when the destructor is called.
  • Loading branch information
@addaleax
addaleax committed Feb 21, 2019
commit c43d20bc84212db6daf54167428d91705e2f3a13
2 changes: 1 addition & 1 deletion src/stream_pipe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ StreamPipe::StreamPipe(StreamBase* source,
}

StreamPipe::~StreamPipe() {
CHECK(is_closed_);
Unpipe();
}

StreamBase* StreamPipe::source() {
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-worker-terminate-http2-respond-with-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const assert = require('assert');
const http2 = require('http2');
const makeDuplexPair = require('../common/duplexpair');
const { Worker, isMainThread } = require('worker_threads');

// This is a variant of test-http2-generic-streams-sendfile for checking
// that Workers can be terminated during a .respondWithFile() operation.

if (isMainThread) {
return new Worker(__filename);
}

{
const server = http2.createServer();
server.on('stream', common.mustCall((stream, headers) => {
stream.respondWithFile(process.execPath); // Use a large-ish file.
}));

const { clientSide, serverSide } = makeDuplexPair();
server.emit('connection', serverSide);

const client = http2.connect('http://localhost:80', {
createConnection: common.mustCall(() => clientSide)
});

const req = client.request();

req.on('response', common.mustCall((headers) => {
assert.strictEqual(headers[':status'], 200);
}));

req.on('data', common.mustCall(process.exit));
req.on('end', common.mustNotCall());
req.end();
}