v6.x backport: buffer,string_decoder: consolidate encoding validation logic#8463
Closed
addaleax wants to merge 1 commit intonodejs:v6.x-stagingfrom
Closed
v6.x backport: buffer,string_decoder: consolidate encoding validation logic#8463addaleax wants to merge 1 commit intonodejs:v6.x-stagingfrom
addaleax wants to merge 1 commit intonodejs:v6.x-stagingfrom
Conversation
nodejs-github-bot
added
buffer
Member
|
LGTM |
Contributor
|
LGTM, thanks! |
Fishrock123
force-pushed
the
v6.x-staging
branch
2 times, most recently
from
b596da0 to
49f996f
Compare
Buffer.isEncoding and string_decoder.normalizeEncoding shared quite a bit of logic. This moves the primary logic into internal/util. The userland modules that monkey patch Buffer.isEncoding should still work. PR-URL: nodejs#7207 Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Member
Author
|
@Fishrock123 … I guess you force-pushed to v6.x-staging or something? (edit: ah, yes, I see it in IRC now) I am rebasing this, but in case something goes wrong, 8141ff1 (the current HEAD here) should apply cleanly. |
addaleax
force-pushed
the
backport-7207
branch
from
8141ff1 to
9fda526
Compare
Contributor
|
@addaleax see #node-dev... I had to twice. :S |
Member
Author
|
yeah, no problem :) |
3 tasks
Fishrock123
pushed a commit
that referenced
this pull request
Sep 13, 2016
Buffer.isEncoding and string_decoder.normalizeEncoding shared quite a bit of logic. This moves the primary logic into internal/util. The userland modules that monkey patch Buffer.isEncoding should still work. PR-URL: #7207 Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: Trevor Norris <trev.norris@gmail.com> Refs: #8463 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Contributor
|
Landed in dd51b1f, thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
v6.x backport of #7207. Conflicts where with neighbouring, unrelated code both in
lib/internal/util.jsandtest/parallel/test-buffer-alloc.js.It’s only a cleanup change but other changes like a6f7b13 are beginning to depend on it.
CI: https://ci.nodejs.org/job/node-test-commit/4975/
/cc @jasnell