Skip to content

http2: tidying up in core.js #17209

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
jasnell wants to merge 9 commits into from
Closed

http2: tidying up in core.js #17209

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b92ff9b
http2: fixup js debug messages
jasnell Nov 22, 2017
2c13db4
http2: simplify and improve rstStream
jasnell Nov 22, 2017
97d488d
http2: improve and simplify _read
jasnell Nov 22, 2017
215a347
http2: simplify and improve priority
jasnell Nov 22, 2017
d22b61c
http2: simplify on ready a bit
jasnell Nov 22, 2017
f35a21a
http2: simplify and improve respond/push
jasnell Nov 22, 2017
3652099
http2: reduce duplication with _unrefActive
jasnell Nov 22, 2017
a9f60af
http2: simplify stream close handling
jasnell Nov 22, 2017
46827db
[Squash] Fix nits
jasnell Nov 22, 2017
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
Next Next commit
http2: simplify stream close handling
  • Loading branch information
@jasnell
jasnell committed Nov 22, 2017
commit a9f60afa122a5c561c8f264a03d8e8ee2bde91f3
10 changes: 3 additions & 7 deletions lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,12 +1144,6 @@ function onSessionClose(hadError, code) {
this.end(); // Close the writable side
}

function onStreamClosed(code) {
abort(this);
this.push(null); // Close the readable side
this.end(); // Close the writable side
}

function streamOnResume() {
if (this[kID] === undefined) {
this.once('ready', streamOnResume);
Expand Down Expand Up @@ -1202,7 +1196,6 @@ class Http2Stream extends Duplex {
writeQueueSize: 0
};

this.once('streamClosed', onStreamClosed);
this.once('finish', onHandleFinish);
this.on('resume', streamOnResume);
this.on('pause', streamOnPause);
Expand Down Expand Up @@ -1477,6 +1470,9 @@ function continueStreamDestroy(err, callback) {
err = new errors.Error('ERR_HTTP2_STREAM_ERROR', code);
}
callback(err);
abort(this);
this.push(null); // Close the readable side
this.end(); // Close the writable side
process.nextTick(emit, this, 'streamClosed', code);
}

Expand Down