Skip to content

Node 8.1.3 #306

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

Merged
mcollina merged 7 commits into from
Jun 29, 2017
Merged

Node 8.1.3 #306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d6918e
Convert classes loosely
mcollina Jun 22, 2017
1c98ed9
Partially solves perf issues with the UInt8Array checks.
mcollina Jun 27, 2017
6116eec
Use instanceof check for Uint8Array.
mcollina Jun 27, 2017
9ef1cf1
Removed useless typeof check.
mcollina Jun 28, 2017
9867e9e
Merge branch 'fix-ie-7-8' into node-8-1-3
mcollina Jun 29, 2017
6eee8f6
Merge branch 'fix-perf-uint8array' into node-8-1-3
mcollina Jun 29, 2017
a5054aa
Updated from Node 8.1.3.
mcollina Jun 29, 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
Partially solves perf issues with the UInt8Array checks. 
Fixes #302
  • Loading branch information
@mcollina
mcollina committed Jun 27, 2017
commit 1c98ed96b50acd111872f35f468c213ca189b86c
2 changes: 1 addition & 1 deletion build/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ function _uint8ArrayToBuffer(chunk) {
return Buffer.from(chunk);
}
function _isUint8Array(obj) {
return Object.prototype.toString.call(obj) === '[object Uint8Array]' || Buffer.isBuffer(obj);
return Buffer.isBuffer(obj) || (typeof obj !== 'string' && Object.prototype.toString.call(obj) === '[object Uint8Array]');
}
/*</replacement>*/
`
Expand Down
2 changes: 1 addition & 1 deletion lib/_stream_readable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function _uint8ArrayToBuffer(chunk) {
return Buffer.from(chunk);
}
function _isUint8Array(obj) {
return Object.prototype.toString.call(obj) === '[object Uint8Array]' || Buffer.isBuffer(obj);
return Buffer.isBuffer(obj) || typeof obj !== 'string' && Object.prototype.toString.call(obj) === '[object Uint8Array]';
}
/*</replacement>*/

Expand Down
31 changes: 10 additions & 21 deletions lib/_stream_writable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function _uint8ArrayToBuffer(chunk) {
return Buffer.from(chunk);
}
function _isUint8Array(obj) {
return Object.prototype.toString.call(obj) === '[object Uint8Array]' || Buffer.isBuffer(obj);
return Buffer.isBuffer(obj) || typeof obj !== 'string' && Object.prototype.toString.call(obj) === '[object Uint8Array]';
}
/*</replacement>*/

Expand Down Expand Up @@ -408,26 +408,15 @@ function doWrite(stream, state, writev, len, chunk, encoding, cb) {

function onwriteError(stream, state, sync, er, cb) {
--state.pendingcb;
if (sync) processNextTick(afterError, stream, state, cb, er);else afterError(stream, state, cb, er);

if (sync) {
// defer the callback if we are being called synchronously
// to avoid piling up things on the stack
processNextTick(cb, er);
// this can emit finish, and it will always happen
// after error
processNextTick(finishMaybe, stream, state);
stream._writableState.errorEmitted = true;
stream.emit('error', er);
} else {
// the caller expect this to happen before if
// it is async
cb(er);
stream._writableState.errorEmitted = true;
stream.emit('error', er);
// this can emit finish, but finish must
// always follow error
finishMaybe(stream, state);
}
stream._writableState.errorEmitted = true;
stream.emit('error', er);
}

function afterError(stream, state, cb, err) {
cb(err);
finishMaybe(stream, state);
}

function onwriteStateUpdate(state) {
Expand Down Expand Up @@ -660,4 +649,4 @@ Writable.prototype._undestroy = destroyImpl.undestroy;
Writable.prototype._destroy = function (err, cb) {
this.end();
cb(err);
};
};
Copy link
Copy Markdown

@yoshuawuyts yoshuawuyts Jun 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lil nit