Skip to content

Backport fixes to v1.x #1560

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
Fishrock123 merged 6 commits into from
May 14, 2015
Merged

Backport fixes to v1.x #1560

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71274b0
tls_wrap: use localhost if options.host is empty
sitegui Apr 21, 2015
5896fe5
test: adjust Makefile/test-ci, add to vcbuild.bat
rvagg Apr 26, 2015
65dd10e
build: remove -J from test-ci
rvagg Apr 28, 2015
898d423
string_decoder: don't cache Buffer.isEncoding
mscdex Apr 28, 2015
4030545
fs: validate fd on fs.write
julianduque Apr 28, 2015
32a6dbc
test: extend timeouts for ARMv6
rvagg Apr 29, 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
string_decoder: don't cache Buffer.isEncoding 
Some modules are monkey-patching Buffer.isEncoding, so without this
they cannot do that.

Fixes: #1547
PR-URL: #1548
PORT-PR-URL: #1560
PORT-FROM: v2.x / 0fa6c4a
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@mscdex @Fishrock123
mscdex authored and Fishrock123 committed May 14, 2015
commit 898d4238208e46fc0f402c6f978ae0f77cb8edce
6 changes: 3 additions & 3 deletions lib/string_decoder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

const isEncoding = Buffer.isEncoding;

function assertEncoding(encoding) {
if (encoding && !isEncoding(encoding)) {
// Do not cache `Buffer.isEncoding`, some modules monkey-patch it to support
// additional encodings
if (encoding && !Buffer.isEncoding(encoding)) {
throw new Error('Unknown encoding: ' + encoding);
}
}
Expand Down