Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
	ChangeLog
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/src/version.c
	deps/v8/src/log-utils.cc
	src/node_version.h

ChangeLog

@@ -392,6 +392,21 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
 
 
+2013.12.18, Version 0.10.24 (Stable), b7fd6bc899ccb629d790c47aee06aba87e535c41
+
+* uv: Upgrade to v0.10.21
+
+* npm: upgrade to 1.3.21
+
+* v8: backport fix for CVE-2013-{6639|6640}
+
+* build: unix install node and dep library headers (Timothy J Fontaine)
+
+* cluster, v8: fix --logfile=%p.log (Ben Noordhuis)
+
+* module: only cache package main (Wyatt Preul)
+
+
 2013.12.12, Version 0.10.23 (Stable), 0462bc23564e7e950a70ae4577a840b04db6c7c6
 
 * uv: Upgrade to v0.10.20 (Timothy J Fontaine)

deps/npm/doc/misc/npm-config.md

@@ -194,6 +194,13 @@ re-checking against the registry.
 Note that no purging is done unless the `npm cache clean` command is
 explicitly used, and that only GET requests use the cache.
 
+### cert
+
+* Default: `null`
+* Type: String
+
+A client certificate to pass when accessing the registry.
+
 ### color
 
 * Default: true on Posix, false on Windows
@@ -202,14 +209,6 @@ explicitly used, and that only GET requests use the cache.
 If false, never shows colors.  If `"always"` then always shows colors.
 If true, then only prints color codes for tty file descriptors.
 
-### coverage
-
-* Default: false
-* Type: Boolean
-
-A flag to tell test-harness to run with their coverage options enabled,
-if they respond to the `npm_config_coverage` environment variable.
-
 ### depth
 
 * Default: Infinity
@@ -243,6 +242,12 @@ set.
 
 The command to run for `npm edit` or `npm config edit`.
 
+### email
+
+The email of the logged-in user.
+
+Set by the `npm adduser` command.  Should not be set explicitly.
+
 ### engine-strict
 
 * Default: false
@@ -305,6 +310,13 @@ The command to use for git commands.  If git is installed on the
 computer, but is not in the `PATH`, then set this to the full path to
 the git binary.
 
+### git-tag-version
+
+* Default: `true`
+* Type: Boolean
+
+Tag the commit when using the `npm version` command.
+
 ### global
 
 * Default: false
@@ -326,17 +338,6 @@ Operates in "global" mode, so that packages are installed into the
 
 The config file to read for global config options.
 
-### globalignorefile
-
-* Default: {prefix}/etc/npmignore
-* Type: path
-
-The config file to read for global ignore patterns to apply to all users
-and all projects.
-
-If not found, but there is a "gitignore" file in the
-same directory, then that will be used instead.
-
 ### group
 
 * Default: GID of the current process
@@ -345,6 +346,13 @@ same directory, then that will be used instead.
 The group to use when running package scripts in global mode as the root
 user.
 
+### heading
+
+* Default: `"npm"`
+* Type: String
+
+The string that starts all the debugging log output.
+
 ### https-proxy
 
 * Default: the `HTTPS_PROXY` or `https_proxy` or `HTTP_PROXY` or
@@ -353,20 +361,12 @@ user.
 
 A proxy to use for outgoing https requests.
 
-### user-agent
-
-* Default: node/{process.version} {process.platform} {process.arch}
-* Type: String
+### ignore-scripts
 
-Sets a User-Agent to the request header
-
-### ignore
-
-* Default: ""
-* Type: string
+* Default: false
+* Type: Boolean
 
-A white-space separated list of glob patterns of files to always exclude
-from packages when building tarballs.
+If true, npm does not run scripts specified in package.json files.
 
 ### init-module
 
@@ -378,13 +378,6 @@ documentation for the
 [init-package-json](https://github.com/isaacs/init-package-json) module
 for more information, or npm-init(1).
 
-### init.version
-
-* Default: "0.0.0"
-* Type: semver
-
-The value `npm init` should use by default for the package version.
-
 ### init.author.name
 
 * Default: ""
@@ -424,6 +417,13 @@ This feature is currently experimental, and the output data structures
 for many commands is either not implemented in JSON yet, or subject to
 change.  Only the output from `npm ls --json` is currently valid.
 
+### key
+
+* Default: `null`
+* Type: String
+
+A client key to pass when accessing the registry.
+
 ### link
 
 * Default: false
@@ -440,6 +440,14 @@ if one of the two conditions are met:
 * the globally installed version is identical to the version that is
   being installed locally.
 
+### local-address
+
+* Default: undefined
+* Type: IP Address
+
+The IP address of the local interface to use when making connections
+to the npm registry.  Must be IPv4 in versions of Node prior to 0.12.
+
 ### loglevel
 
 * Default: "http"
@@ -495,15 +503,7 @@ The node version to use when checking package's "engines" hash.
 * Default: false
 * Type: Boolean
 
-Run tests on installation and report results to the
-`npaturl`.
-
-### npaturl
-
-* Default: Not yet implemented
-* Type: url
-
-The url to report npat test results.
+Run tests on installation.
 
 ### onload-script
 
@@ -763,16 +763,6 @@ The username on the npm registry.  Set with `npm adduser`
 
 The location of user-level configuration settings.
 
-### userignorefile
-
-* Default: ~/.npmignore
-* Type: path
-
-The location of a user-level ignore file to apply to all packages.
-
-If not found, but there is a .gitignore file in the same directory, then
-that will be used instead.
-
 ### umask
 
 * Default: 022
@@ -785,6 +775,13 @@ Folders and executables are given a mode which is `0777` masked against
 this value.  Other files are given a mode which is `0666` masked against
 this value.  Thus, the defaults are `0755` and `0644` respectively.
 
+### user-agent
+
+* Default: node/{process.version} {process.platform} {process.arch}
+* Type: String
+
+Sets a User-Agent to the request header
+
 ### version
 
 * Default: false
@@ -813,17 +810,6 @@ The program to use to view help content.
 
 Set to `"browser"` to view html help content in the default web browser.
 
-### yes
-
-* Default: null
-* Type: Boolean or null
-
-If set to `null`, then prompt the user for responses in some
-circumstances.
-
-If set to `true`, then answer "yes" to any prompt.  If set to `false`
-then answer "no" to any prompt.
-
 ## SEE ALSO
 
 * npm-config(1)

deps/npm/html/doc/README.html

@@ -239,7 +239,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="cli/npm.html">npm(1)</a></li><li><a href="misc/npm-faq.html">npm-faq(7)</a></li><li><a href="cli/npm-help.html">npm-help(1)</a></li><li><a href="misc/npm-index.html">npm-index(7)</a></li></ul>
 </div>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].17</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-bin.html

@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This function should not be used programmatically.  Instead, just refer
 to the <code>npm.bin</code> member.</p>
 </div>
-<p id="footer">npm-bin &mdash; [email protected].17</p>
+<p id="footer">npm-bin &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-bugs.html

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">npm-bugs &mdash; [email protected].17</p>
+<p id="footer">npm-bugs &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-commands.html

@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../misc/npm-index.html">npm-index(7)</a></li></ul>
 </div>
-<p id="footer">npm-commands &mdash; [email protected].17</p>
+<p id="footer">npm-commands &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-config.html

@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
 </div>
-<p id="footer">npm-config &mdash; [email protected].17</p>
+<p id="footer">npm-config &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-deprecate.html

@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul>
 </div>
-<p id="footer">npm-deprecate &mdash; [email protected].17</p>
+<p id="footer">npm-deprecate &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-docs.html

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">npm-docs &mdash; [email protected].17</p>
+<p id="footer">npm-docs &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-edit.html

@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Since this command opens an editor in a new process, be careful about where
 and how this is used.</p>
 </div>
-<p id="footer">npm-edit &mdash; [email protected].17</p>
+<p id="footer">npm-edit &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-explore.html

@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>The first element in the &#39;args&#39; parameter must be a package name.  After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
 </div>
-<p id="footer">npm-explore &mdash; [email protected].17</p>
+<p id="footer">npm-explore &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-help-search.html

@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>The silent parameter is not neccessary not used, but it may in the future.</p>
 </div>
-<p id="footer">npm-help-search &mdash; [email protected].17</p>
+<p id="footer">npm-help-search &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-init.html

@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <p><a href="../files/package.json.html">package.json(5)</a></p>
 </div>
-<p id="footer">npm-init &mdash; [email protected].17</p>
+<p id="footer">npm-init &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-install.html

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Finally, &#39;callback&#39; is a function that will be called when all packages have been
 installed or when an error has been encountered.</p>
 </div>
-<p id="footer">npm-install &mdash; [email protected].17</p>
+<p id="footer">npm-install &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-link.html

@@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Now, any changes to the redis package will be reflected in
 the package in the current working directory</p>
 </div>
-<p id="footer">npm-link &mdash; [email protected].17</p>
+<p id="footer">npm-link &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-load.html

@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>For a list of all the available command-line configs, see <code>npm help config</code></p>
 </div>
-<p id="footer">npm-load &mdash; [email protected].17</p>
+<p id="footer">npm-load &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-ls.html

@@ -59,7 +59,7 @@ <h3 id="global">global</h3>
 This means that if a submodule a same dependency as a parent module, then the
 dependency will only be output once.</p>
 </div>
-<p id="footer">npm-ls &mdash; [email protected].17</p>
+<p id="footer">npm-ls &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-outdated.html

@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>If the &#39;packages&#39; parameter is left out, npm will check all packages.</p>
 </div>
-<p id="footer">npm-outdated &mdash; [email protected].17</p>
+<p id="footer">npm-outdated &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-owner.html

@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul>
 </div>
-<p id="footer">npm-owner &mdash; [email protected].17</p>
+<p id="footer">npm-owner &mdash; [email protected].21</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")