Skip to content

http: fix agent.getName() and add tests #1617

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
brendanashworth wants to merge 50 commits into from
Closed

http: fix agent.getName() and add tests #1617

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e3a4824
test: remove obsolete harmony flags
chrisdickinson May 5, 2015
b26a7cb
deps: update v8 to 4.3.61.21
chrisdickinson May 5, 2015
6950d62
doc: update v8 flags in man page
targos May 14, 2015
0925aba
Revert "dns: remove AI_V4MAPPED hint flag on FreeBSD"
cjihrig Apr 29, 2015
7a3e354
net: do not set V4MAPPED on FreeBSD
Mar 2, 2015
f49aed1
deps: backport 7b24219346 from v8 upstream
rvagg May 27, 2015
1ed4e13
buffer: allow ARGS_THIS to accept a name
trevnorris May 26, 2015
e8734c0
buffer: implement Uint8Array backed Buffer
trevnorris May 26, 2015
e435bf7
buffer: finish implementing FreeCallback
trevnorris Jun 1, 2015
ad91c1d
buffer: switch to using Maybe<T> API
trevnorris Jun 2, 2015
2903030
buffer: switch API to return MaybeLocal<T>
trevnorris Jun 2, 2015
07924b8
buffer: make additional changes to native API
trevnorris Jun 2, 2015
53f8549
crypto: remove kMaxLength on randomBytes()
trevnorris Jun 2, 2015
84c58a3
vm: fix property descriptors of sandbox properties
domenic May 22, 2015
9093ea7
vm: remove unnecessary access checks
domenic May 23, 2015
84950bc
vm: fix symbol access
domenic Jun 1, 2015
1da8ec3
dgram: make send cb act as "error" event handler
chrisdickinson Jun 5, 2014
59a23ed
dgram: make send cb act as "error" event handler
mcollina May 26, 2015
646d67b
http_server: `prefinish` vs `finish`
indutny Apr 13, 2015
a799038
buffer: fix case of one buffer passed to concat
thefourtheye Jun 10, 2015
309c0f4
cluster: do not unconditionally set --debug-port
cjihrig Jun 11, 2015
74772b4
buffer: fix usage of kMaxLength
trevnorris Jun 17, 2015
f115dfc
buffer: minor cleanup from rebase
trevnorris Jun 17, 2015
197ba00
buffer: allow ArrayBuffer as Buffer argument
trevnorris Jun 17, 2015
90c72d4
readline: allow tabs in input
Trott May 21, 2015
4527bbf
deps: update v8 to 4.4.63.9
bnoordhuis Jun 19, 2015
67d9391
test: don't use arguments.callee
bnoordhuis Jun 19, 2015
8835c3d
test: remove two obsolete pummel tests
bnoordhuis Jun 19, 2015
d15ddea
buffer: rename internal/buffer_new.js to buffer.js
bnoordhuis Jun 19, 2015
6e72ac7
Merge tag 'v2.3.1' into next
bnoordhuis Jun 25, 2015
033a728
build,win: set env before generating projects
orangemocha Apr 23, 2015
0fb8d45
build: add MSVS 2015 support
rvagg Apr 16, 2015
32c6a66
build: fix cherry-pick ooops, fix comment wording
rvagg Jun 23, 2015
c4bba16
build: update build targets for io.js
rvagg Jun 10, 2015
a6bc75d
build: add tar-headers target for headers-only tar
rvagg Jun 14, 2015
bda3a2d
node-gyp: make aware of nightly, next-nightly & rc
rvagg Jun 26, 2015
8f6f428
node-gyp: download header tarball for compile
rvagg Jun 26, 2015
483aac9
Working on v3.0.0
rvagg Jun 30, 2015
bf7df17
deps: upgrade v8 to 4.4.63.12
bnoordhuis Jul 1, 2015
a5745aa
src: increment NODE_MODULE_VERSION to 45
rvagg Jul 2, 2015
8a1986f
src: update comment for NODE_MODULE_VERSION
rvagg Jul 2, 2015
7387297
test: add test for missing `close`/`finish` event
not-implemented Apr 13, 2015
3beae2c
Merge branch 'master' into next
trevnorris Jul 10, 2015
cbec3ee
node: do not override `message`/`stack` of error
indutny Jul 5, 2015
235036e
http: use official IANA Status Codes
jomo Jul 11, 2015
cf9e02d
buffer: fix not return on error
trevnorris Jul 22, 2015
4737dcd
build: first set of updates to enable PPC support
mhdawson Jul 7, 2015
9cf36a1
buffer: fix missing null/undefined check
trevnorris Jul 16, 2015
115bf08
node: remove redundant --use-old-buffer
rvagg Jul 30, 2015
f0de101
http: fix agent.getName() and add tests
brendanashworth May 5, 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
buffer: fix case of one buffer passed to concat 
Fix Buffer.concat() so a copy is always returned regardless of the
number of buffers that were passed.

Previously if the array length was one then the same same buffer was
returned. This created a special case for the user where there was a
chance mutating the buffer returned by .concat() could mutate the buffer
passed in.

Also fixes an inconsistency when throwing if an array member was not a
Buffer instance. For example:

    Buffer.concat([42]);      // Returns 42
    Buffer.concat([42, 1]);  // Throws a TypeError

Now .concat() will always throw if an array member is not a Buffer
instance.

See: #1891
PR-URL: #1937
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
@thefourtheye @chrisdickinson
thefourtheye authored and chrisdickinson committed Jun 17, 2015
commit a7990386435c2cf7c21f42e67786f6733195e4a4
5 changes: 0 additions & 5 deletions doc/api/buffer.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ the list together.
If the list has no items, or if the totalLength is 0, then it returns a
zero-length buffer.

If the list has exactly one item, then the first item of the list is
returned.

If the list has more than one item, then a new Buffer is created.

If totalLength is not provided, it is read from the buffers in the list.
However, this adds an additional loop to the function, so it is faster
to provide the length explicitly.
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/buffer_new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,6 @@ Buffer.concat = function(list, length) {

if (list.length === 0)
return new Buffer(0);
else if (list.length === 1)
return list[0];

if (length === undefined) {
length = 0;
Expand Down
2 changes: 0 additions & 2 deletions lib/internal/buffer_old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ Buffer.concat = function(list, length) {

if (list.length === 0)
return new Buffer(0);
else if (list.length === 1)
return list[0];

if (length === undefined) {
length = 0;
Expand Down
8 changes: 7 additions & 1 deletion test/parallel/test-buffer-concat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@ var flatLongLen = Buffer.concat(long, 40);

assert(flatZero.length === 0);
assert(flatOne.toString() === 'asdf');
assert(flatOne === one[0]);
// A special case where concat used to return the first item,
// if the length is one. This check is to make sure that we don't do that.
assert(flatOne !== one[0]);
assert(flatLong.toString() === (new Array(10 + 1).join('asdf')));
assert(flatLongLen.toString() === (new Array(10 + 1).join('asdf')));

assert.throws(function() {
Buffer.concat([42]);
}, TypeError);

console.log('ok');