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
TooTallNate · Jun 10, 2014 · 1a09da6 · 1a09da6
2 parents ab50fad + 1cb6f1a
commit 1a09da6
Show file tree

Hide file tree

Showing 388 changed files with 4,466 additions and 2,584 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -553,3 +553,7 @@ Farrin Reid <blakmatrix@gmail.com>
 Denys Zariaiev <denys.zariaiev@gmail.com>
 Sean McArthur <sean.monstar@gmail.com>
 Rasmus Christian Pedersen <zerhacken@yahoo.com>
+Greg Sabia Tucker <greg@narrowlabs.com>
+Calvin Metcalf <calvin.metcalf@gmail.com>
+cjihrig <cjihrig@gmail.com>
+Chris Barber <chris@cb1inc.com>
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-2014.05.01, Version 0.11.13 (Unstable)
+2014.05.01, Version 0.11.13 (Unstable), 99c9930ad626e2796af23def7cac19b65c608d18
 
 * v8: upgrade to 3.24.35.22
 
@@ -618,7 +618,35 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
 
 
-2014.05.01, Version 0.10.28 (Stable)
+2014.06.05, Version 0.10.29 (Stable), ce82d6b8474bde7ac7df6d425fb88fb1bcba35bc
+
+* openssl: to 1.0.1h (CVE-2014-0224)
+
+* npm: upgrade to 1.4.10
+
+* utf8: Prevent Node from sending invalid UTF-8 (Felix Geisendörfer)
+  - *NOTE* this introduces a breaking change, previously you could construct
+    invalid UTF-8 and invoke an error in a client that was expecting valid
+    UTF-8, now unmatched surrogate pairs are replaced with the unknown UTF-8
+    character. To restore the old functionality simply have NODE_INVALID_UTF8
+    environment variable set.
+
+* child_process: do not set args before throwing (Greg Sabia Tucker)
+
+* child_process: spawn() does not throw TypeError (Greg Sabia Tucker)
+
+* constants: export O_NONBLOCK (Fedor Indutny)
+
+* crypto: improve memory usage (Alexis Campailla)
+
+* fs: close file if fstat() fails in readFile() (cjihrig)
+
+* lib: name EventEmitter prototype methods (Ben Noordhuis)
+
+* tls: fix performance issue (Alexis Campailla)
+
+
+2014.05.01, Version 0.10.28 (Stable), b148cbe09d4657766fdb61575ba985734c2ff0a8
 
 * npm: upgrade to v1.4.9
 

diff --git a/deps/npm/.npmrc b/deps/npm/.npmrc
@@ -0,0 +1,2 @@
+save-prefix = ~
+proprietary-attribs = false
diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE
@@ -214,9 +214,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------
 
 
-"Node.js" and "node" trademark Joyent, Inc.  npm is not officially
-part of the Node.js project, and is neither owned by nor
-officially affiliated with Joyent, Inc.
+"Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
+project, and is neither owned by nor affiliated with Joyent, Inc.
 
 Packages published in the npm registry (other than the Software and
 its included dependencies) are not part of npm itself, are the sole

diff --git a/deps/npm/Makefile b/deps/npm/Makefile
@@ -169,8 +169,7 @@ publish: link doc
 	git push origin &&\
 	git push origin --tags &&\
 	npm publish &&\
-	make doc-publish &&\
-	make zip-publish
+	make doc-publish
 
 docpublish: doc-publish
 doc-publish: doc
@@ -202,13 +201,10 @@ doc-publish: doc
     esac; \
   done
 
-zip-publish: release
-	scp release/* node@nodejs.org:dist/npm/
-
 release:
 	@bash scripts/release.sh
 
 sandwich:
 	@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13)
 
-.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release zip-publish
+.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release
diff --git a/deps/npm/bin/npm b/deps/npm/bin/npm
@@ -1,4 +1,5 @@
 #!/bin/sh
+(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
 
 basedir=`dirname "$0"`
 

diff --git a/deps/npm/doc/api/npm-cache.md b/deps/npm/doc/api/npm-cache.md
@@ -0,0 +1,30 @@
+npm-cache(3) -- manage the npm cache programmatically
+=====================================================
+
+## SYNOPSIS
+
+    npm.commands.cache([args], callback)
+
+    // helpers
+    npm.commands.cache.clean([args], callback)
+    npm.commands.cache.add([args], callback)
+    npm.commands.cache.read(name, version, forceBypass, callback)
+
+## DESCRIPTION
+
+This acts much the same ways as the npm-cache(1) command line
+functionality.
+
+The callback is called with the package.json data of the thing that is
+eventually added to or read from the cache.
+
+The top level `npm.commands.cache(...)` functionality is a public
+interface, and like all commands on the `npm.commands` object, it will
+match the command line behavior exactly.
+
+However, the cache folder structure and the cache helper functions are
+considered **internal** API surface, and as such, may change in future
+releases of npm, potentially without warning or significant version
+incrementation.
+
+Use at your own risk.
diff --git a/deps/npm/doc/cli/npm-cache.md b/deps/npm/doc/cli/npm-cache.md
@@ -37,16 +37,14 @@ npm stores cache data in the directory specified in `npm config get cache`.
 For each package that is added to the cache, three pieces of information are
 stored in `{cache}/{name}/{version}`:
 
-* .../package/:
-  A folder containing the package contents as they appear in the tarball.
-* .../package.json:
-  The package.json file, as npm sees it, with overlays applied and a _id attribute.
+* .../package/package.json:
+  The package.json file, as npm sees it.
 * .../package.tgz:
   The tarball for that version.
 
 Additionally, whenever a registry request is made, a `.cache.json` file
 is placed at the corresponding URI, to store the ETag and the requested
-data.
+data.  This is stored in `{cache}/{hostname}/{path}/.cache.json`.
 
 Commands that make non-essential registry requests (such as `search` and
 `view`, or the completion scripts) generally specify a minimum timeout.

diff --git a/deps/npm/doc/cli/npm-run-script.md b/deps/npm/doc/cli/npm-run-script.md
@@ -4,6 +4,7 @@ npm-run-script(1) -- Run arbitrary package scripts
 ## SYNOPSIS
 
     npm run-script [<pkg>] [command]
+    npm run [<pkg>] [command]
 
 ## DESCRIPTION
 

diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md
@@ -31,6 +31,22 @@ Use `npm install blerg` to install the latest version of "blerg".  Check out
 Use the `npm search` command to show everything that's available.
 Use `npm ls` to show everything you've installed.
 
+## DEPENDENCIES
+
+If a package references to another package with a git URL, npm depends
+on a preinstalled git.
+
+If one of the packages npm tries to install is a native node module and
+requires compiling of C++ Code, npm will use
+[node-gyp](https://github.com/TooTallNate/node-gyp) for that task.
+For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp)
+needs Python, make and a buildchain like GCC. On Windows,
+Python and Microsoft Visual Studio C++ is needed. Python 3 is
+not supported by [node-gyp](https://github.com/TooTallNate/node-gyp).
+For more information visit
+[the node-gyp repository](https://github.com/TooTallNate/node-gyp) and
+the [node-gyp Wiki](https://github.com/TooTallNate/node-gyp/wiki).
+
 ## DIRECTORIES
 
 See `npm-folders(5)` to learn about where npm puts stuff.

diff --git a/deps/npm/doc/files/npmrc.md b/deps/npm/doc/files/npmrc.md
@@ -13,8 +13,9 @@ For a list of available configuration options, see npm-config(7).
 
 ## FILES
 
-The three relevant files are:
+The four relevant files are:
 
+* per-project config file (/path/to/my/project/.npmrc)
 * per-user config file (~/.npmrc)
 * global config file ($PREFIX/npmrc)
 * npm builtin config file (/path/to/npm/npmrc)
@@ -29,6 +30,17 @@ Each of these files is loaded, and config options are resolved in
 priority order.  For example, a setting in the userconfig file would
 override the setting in the globalconfig file.
 
+### Per-project config file
+
+When working locally in a project, a `.npmrc` file in the root of the
+project (ie, a sibling of `node_modules` and `package.json`) will set
+config values specific to this project.
+
+Note that this only applies to the root of the project that you're
+running npm in.  It has no effect when your module is published.  For
+example, you can't publish a module that forces itself to install
+globally, or in a different location.
+
 ### Per-user config file
 
 `$HOME/.npmrc` (or the `userconfig` param, if set in the environment

diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md
@@ -24,8 +24,9 @@ same.
 
 ### npmrc Files
 
-The three relevant files are:
+The four relevant files are:
 
+* per-project config file (/path/to/my/project/.npmrc)
 * per-user config file (~/.npmrc)
 * global config file ($PREFIX/npmrc)
 * npm builtin config file (/path/to/npm/npmrc)
@@ -712,6 +713,17 @@ using `-s` to add a signature.
 Note that git requires you to have set up GPG keys in your git configs
 for this to work properly.
 
+### spin
+
+* Default: true
+* Type: Boolean or `"always"`
+
+When set to `true`, npm will display an ascii spinner while it is doing
+things, if `process.stderr` is a TTY.
+
+Set to `false` to suppress the spinner, or set to `always` to output
+the spinner even for non-TTY outputs.
+
 ### strict-ssl
 
 * Default: true

diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md
@@ -258,7 +258,7 @@ change it again?  npm doesn't currently track any state about past
 configuration settings, so this would be rather difficult to do
 properly.  It would have to track every previous value for this
 config, and always accept any of them, or else yesterday's install may
-be broken tomorrow.  Complexity hurdle #5.
+be broken tomorrow.  Complexity hurdle #4.
 
 Never going to happen.  The folder is named `node_modules`.  It is
 written indelibly in the Node Way, handed down from the ancient times
@@ -340,7 +340,7 @@ contributed to it, some of them quite substantially.
 
 The npm open source project, The npm Registry, and [the community
 website](https://www.npmjs.org) are maintained and operated by the
-good folks at [npm, Inc.](https://www.npmjs.com)
+good folks at [npm, Inc.](http://www.npmjs.com)
 
 ## I have a question or request not addressed here. Where should I put it?
 

diff --git a/deps/npm/doc/misc/npm-index.md b/deps/npm/doc/misc/npm-index.md
@@ -209,6 +209,10 @@ Display npm bin folder
 
 Bugs for a package in a web browser maybe
 
+## npm-cache(3)
+
+manage the npm cache programmatically
+
 ## npm-commands(3)
 
 npm commands

diff --git a/deps/npm/doc/misc/npm-scripts.md b/deps/npm/doc/misc/npm-scripts.md
@@ -34,7 +34,7 @@ following scripts:
   stop and start scripts if no `restart` script is provided.
 
 Additionally, arbitrary scripts can be run by doing
-`npm run-script <stage> <pkg>`.
+`npm run-script <pkg> <stage>`.
 
 ## NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN