Skip to content

Cleanup stream state in net #465

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
chrisdickinson wants to merge 6 commits into from
Closed

Cleanup stream state in net #465

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5c5ebe
doc: add release GPG fingerprint for chrisdickinson
chrisdickinson Feb 3, 2015
1d8ad7d
net: do not reach through writableState for decodeStrings
chrisdickinson Jan 16, 2015
0e02aaf
net: use pause() instead of changing _readableState.flowing
chrisdickinson Jan 16, 2015
cc402e5
net: do not reach through readableState for ended, do not maniplate .…
chrisdickinson Jan 16, 2015
30cce39
net,stream,tls: nix writableState.errorEmitted
chrisdickinson Jan 16, 2015
f05d1eb
style fixes
chrisdickinson Feb 4, 2015
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
net: do not reach through readableState for ended, do not maniplate .… 
…readable
  • Loading branch information
@chrisdickinson
chrisdickinson committed Feb 4, 2015
commit cc402e5d5415198750da98de81c74cdbfa8020e3
6 changes: 1 addition & 5 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,10 @@ function onSocketFinish() {
}

debug('onSocketFinish');
if (!this.readable || this._readableState.ended) {
if (!this.readable) {
debug('oSF: ended, destroy', this._readableState);
return this.destroy();
}

debug('oSF: not ended, call shutdown()');

// otherwise, just shutdown, or destroy() if not possible
Expand Down Expand Up @@ -238,13 +237,10 @@ function onSocketEnd() {
// ended should already be true, since this is called *after*
// the EOF errno and onread has eof'ed
debug('onSocketEnd', this._readableState);
this._readableState.ended = true;
if (this._readableState.endEmitted) {
this.readable = false;
maybeDestroy(this);
} else {
this.once('end', function() {
this.readable = false;
maybeDestroy(this);
});
this.read(0);
Expand Down