Skip to content

Commit 1a09da6

Browse files
tjfontainetjfontaine
committed
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: AUTHORS ChangeLog deps/v8/src/api.cc deps/v8/src/unicode-inl.h deps/v8/src/unicode.h lib/_stream_readable.js lib/http.js src/cares_wrap.cc src/node.cc src/node_crypto.cc src/node_dtrace.cc src/node_file.cc src/node_stat_watcher.cc src/node_version.h src/process_wrap.cc src/string_bytes.cc src/string_bytes.h src/udp_wrap.cc src/util.h test/simple/test-buffer.js test/simple/test-stream2-compatibility.js
2 parents ab50fad + 1cb6f1a commit 1a09da6

File tree

388 files changed

+4466
-2584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

388 files changed

+4466
-2584
lines changed

‎AUTHORS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,3 +553,7 @@ Farrin Reid <blakmatrix@gmail.com>
553553
Denys Zariaiev <denys.zariaiev@gmail.com>
554554
Sean McArthur <sean.monstar@gmail.com>
555555
Rasmus Christian Pedersen <zerhacken@yahoo.com>
556+
Greg Sabia Tucker <greg@narrowlabs.com>
557+
Calvin Metcalf <calvin.metcalf@gmail.com>
558+
cjihrig <cjihrig@gmail.com>
559+
Chris Barber <chris@cb1inc.com>

‎ChangeLog‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2014.05.01, Version 0.11.13 (Unstable)
1+
2014.05.01, Version 0.11.13 (Unstable), 99c9930ad626e2796af23def7cac19b65c608d18
22

33
* v8: upgrade to 3.24.35.22
44

@@ -618,7 +618,35 @@
618618
* console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
619619

620620

621-
2014.05.01, Version 0.10.28 (Stable)
621+
2014.06.05, Version 0.10.29 (Stable), ce82d6b8474bde7ac7df6d425fb88fb1bcba35bc
622+
623+
* openssl: to 1.0.1h (CVE-2014-0224)
624+
625+
* npm: upgrade to 1.4.10
626+
627+
* utf8: Prevent Node from sending invalid UTF-8 (Felix Geisendörfer)
628+
- *NOTE* this introduces a breaking change, previously you could construct
629+
invalid UTF-8 and invoke an error in a client that was expecting valid
630+
UTF-8, now unmatched surrogate pairs are replaced with the unknown UTF-8
631+
character. To restore the old functionality simply have NODE_INVALID_UTF8
632+
environment variable set.
633+
634+
* child_process: do not set args before throwing (Greg Sabia Tucker)
635+
636+
* child_process: spawn() does not throw TypeError (Greg Sabia Tucker)
637+
638+
* constants: export O_NONBLOCK (Fedor Indutny)
639+
640+
* crypto: improve memory usage (Alexis Campailla)
641+
642+
* fs: close file if fstat() fails in readFile() (cjihrig)
643+
644+
* lib: name EventEmitter prototype methods (Ben Noordhuis)
645+
646+
* tls: fix performance issue (Alexis Campailla)
647+
648+
649+
2014.05.01, Version 0.10.28 (Stable), b148cbe09d4657766fdb61575ba985734c2ff0a8
622650

623651
* npm: upgrade to v1.4.9
624652

‎deps/npm/.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save-prefix = ~
2+
proprietary-attribs = false

‎deps/npm/LICENSE‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
214214
--------
215215

216216

217-
"Node.js" and "node" trademark Joyent, Inc. npm is not officially
218-
part of the Node.js project, and is neither owned by nor
219-
officially affiliated with Joyent, Inc.
217+
"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js
218+
project, and is neither owned by nor affiliated with Joyent, Inc.
220219

221220
Packages published in the npm registry (other than the Software and
222221
its included dependencies) are not part of npm itself, are the sole

‎deps/npm/Makefile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ publish: link doc
169169
git push origin &&\
170170
git push origin --tags &&\
171171
npm publish &&\
172-
make doc-publish &&\
173-
make zip-publish
172+
make doc-publish
174173

175174
docpublish: doc-publish
176175
doc-publish: doc
@@ -202,13 +201,10 @@ doc-publish: doc
202201
esac; \
203202
done
204203

205-
zip-publish: release
206-
scp release/* node@nodejs.org:dist/npm/
207-
208204
release:
209205
@bash scripts/release.sh
210206

211207
sandwich:
212208
@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13)
213209

214-
.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release zip-publish
210+
.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release

‎deps/npm/bin/npm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
2+
(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
23

34
basedir=`dirname "$0"`
45

‎deps/npm/doc/api/npm-cache.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
npm-cache(3) -- manage the npm cache programmatically
2+
=====================================================
3+
4+
## SYNOPSIS
5+
6+
npm.commands.cache([args], callback)
7+
8+
// helpers
9+
npm.commands.cache.clean([args], callback)
10+
npm.commands.cache.add([args], callback)
11+
npm.commands.cache.read(name, version, forceBypass, callback)
12+
13+
## DESCRIPTION
14+
15+
This acts much the same ways as the npm-cache(1) command line
16+
functionality.
17+
18+
The callback is called with the package.json data of the thing that is
19+
eventually added to or read from the cache.
20+
21+
The top level `npm.commands.cache(...)` functionality is a public
22+
interface, and like all commands on the `npm.commands` object, it will
23+
match the command line behavior exactly.
24+
25+
However, the cache folder structure and the cache helper functions are
26+
considered **internal** API surface, and as such, may change in future
27+
releases of npm, potentially without warning or significant version
28+
incrementation.
29+
30+
Use at your own risk.

‎deps/npm/doc/cli/npm-cache.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@ npm stores cache data in the directory specified in `npm config get cache`.
3737
For each package that is added to the cache, three pieces of information are
3838
stored in `{cache}/{name}/{version}`:
3939

40-
* .../package/:
41-
A folder containing the package contents as they appear in the tarball.
42-
* .../package.json:
43-
The package.json file, as npm sees it, with overlays applied and a _id attribute.
40+
* .../package/package.json:
41+
The package.json file, as npm sees it.
4442
* .../package.tgz:
4543
The tarball for that version.
4644

4745
Additionally, whenever a registry request is made, a `.cache.json` file
4846
is placed at the corresponding URI, to store the ETag and the requested
49-
data.
47+
data. This is stored in `{cache}/{hostname}/{path}/.cache.json`.
5048

5149
Commands that make non-essential registry requests (such as `search` and
5250
`view`, or the completion scripts) generally specify a minimum timeout.

‎deps/npm/doc/cli/npm-run-script.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ npm-run-script(1) -- Run arbitrary package scripts
44
## SYNOPSIS
55

66
npm run-script [<pkg>] [command]
7+
npm run [<pkg>] [command]
78

89
## DESCRIPTION
910

‎deps/npm/doc/cli/npm.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ Use `npm install blerg` to install the latest version of "blerg". Check out
3131
Use the `npm search` command to show everything that's available.
3232
Use `npm ls` to show everything you've installed.
3333

34+
## DEPENDENCIES
35+
36+
If a package references to another package with a git URL, npm depends
37+
on a preinstalled git.
38+
39+
If one of the packages npm tries to install is a native node module and
40+
requires compiling of C++ Code, npm will use
41+
[node-gyp](https://github.com/TooTallNate/node-gyp) for that task.
42+
For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp)
43+
needs Python, make and a buildchain like GCC. On Windows,
44+
Python and Microsoft Visual Studio C++ is needed. Python 3 is
45+
not supported by [node-gyp](https://github.com/TooTallNate/node-gyp).
46+
For more information visit
47+
[the node-gyp repository](https://github.com/TooTallNate/node-gyp) and
48+
the [node-gyp Wiki](https://github.com/TooTallNate/node-gyp/wiki).
49+
3450
## DIRECTORIES
3551

3652
See `npm-folders(5)` to learn about where npm puts stuff.

0 commit comments

Comments
 (0)