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

Conflicts:
	ChangeLog
	deps/uv/ChangeLog
	deps/uv/include/uv-darwin.h
	deps/uv/src/unix/fsevents.c
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	doc/api/addons.markdown
	doc/api/cluster.markdown
	doc/api/http.markdown
	lib/http.js
	lib/tls.js
	src/node_crypto.cc
	src/node_http_parser.cc
	src/node_version.h
	src/pipe_wrap.cc
	src/v8abbr.h
	src/v8ustack.d
	test/simple/test-http-pipeline-flood.js

ChangeLog

@@ -310,6 +310,27 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
 
 
+2013.10.18, Version 0.10.21 (Stable), e2da042844a830fafb8031f6c477eb4f96195210
+
+* uv: Upgrade to v0.10.18
+
+* crypto: clear errors from verify failure (Timothy J Fontaine)
+
+* dtrace: interpret two byte strings (Dave Pacheco)
+
+* fs: fix fs.truncate() file content zeroing bug (Ben Noordhuis)
+
+* http: provide backpressure for pipeline flood (isaacs)
+
+* tls: fix premature connection termination (Ben Noordhuis)
+
+
+2013.09.30, Version 0.10.20 (Stable), d7234c8d50a1af73f60d2d3c0cc7eed17429a481
+
+* tls: fix sporadic hang and partial reads (Fedor Indutny)
+  - fixes "npm ERR! cb() never called!"
+
+
 2013.09.24, Version 0.10.19 (Stable), 6b5e6a5a3ec8d994c9aab3b800b9edbf1b287904
 
 * uv: Upgrade to v0.10.17

README.md

@@ -33,6 +33,19 @@ Windows:
 
     vcbuild nosign
 
+You can download pre-built binaries for various operating systems from
+[http://nodejs.org/download/](http://nodejs.org/download/).  The Windows
+and OS X installers will prompt you for the location to install to.
+The tarballs are self-contained; you can extract them to a local directory
+with:
+
+    tar xzf /path/to/node-<version>-<platform>-<arch>.tar.gz
+
+Or system-wide with:
+
+    cd /usr/local && tar --strip-components 1 -xzf \
+                         /path/to/node-<version>-<platform>-<arch>.tar.gz
+
 ### To run the tests:
 
 Unix/Macintosh:

deps/npm/Makefile

@@ -71,7 +71,7 @@ link: uninstall
 	node cli.js link -f
 
 clean: ronnclean doc-clean uninstall
-	rm npmrc
+	rm -rf npmrc
 	node cli.js cache clean
 
 uninstall:
@@ -154,13 +154,13 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
 ronn: node_modules/.bin/ronn
 
 node_modules/.bin/ronn:
-	node cli.js install ronn
+	node cli.js install ronn --no-global
 
 doc: man
 
 man: $(cli_docs) $(api_docs)
 
-test:
+test: doc
 	node cli.js test
 
 publish: link doc

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

@@ -33,9 +33,9 @@ Used to add, list, or clear the npm cache folder.
 
 ## DETAILS
 
-npm stores cache data in `$HOME/.npm`.  For each package that is added
-to the cache, three pieces of information are stored in
-`{cache}/{name}/{version}`:
+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.
@@ -57,7 +57,7 @@ they do not make an HTTP request to the registry.
 
 ### cache
 
-Default: `$HOME/.npm` on Posix, or `$HOME/npm-cache` on Windows.
+Default: `~/.npm` on Posix, or `%AppData%/npm-cache` on Windows.
 
 The root cache folder.
 

deps/npm/doc/cli/npm-dedupe.md

@@ -47,6 +47,10 @@ registry.
 
 This feature is experimental, and may change in future versions.
 
+The `--tag` argument will apply to all of the affected dependencies. If a
+tag with the given name exists, the tagged version is preferred over newer
+versions.
+
 ## SEE ALSO
 
 * npm-ls(1)

deps/npm/doc/cli/npm-install.md

@@ -152,7 +152,9 @@ For example:
 
     npm install sax@">=0.1.0 <0.2.0" bench supervisor
 
-The `--tag` argument will apply to all of the specified install targets.
+The `--tag` argument will apply to all of the specified install targets. If a
+tag with the given name exists, the tagged version is preferred over newer
+versions.
 
 The `--force` argument will force npm to fetch remote resources even if a
 local copy exists on disk.

deps/npm/doc/cli/npm-outdated.md

@@ -10,6 +10,10 @@ npm-outdated(1) -- Check for outdated packages
 This command will check the registry to see if any (or, specific) installed
 packages are currently outdated.
 
+The resulting field 'wanted' shows the latest version according to the
+version specified in the package.json, the field 'latest' the very latest
+version of the package.
+
 ## SEE ALSO
 
 * npm-update(1)

deps/npm/doc/cli/npm-prune.md

@@ -4,6 +4,7 @@ npm-prune(1) -- Remove extraneous packages
 ## SYNOPSIS
 
     npm prune [<name> [<name ...]]
+    npm prune [<name> [<name ...]] [--production]
 
 ## DESCRIPTION
 
@@ -14,6 +15,9 @@ removed.
 Extraneous packages are packages that are not listed on the parent
 package's dependencies list.
 
+If the `--production` flag is specified, this command will remove the
+packages specified in your `devDependencies`.
+
 ## SEE ALSO
 
 * npm-rm(1)

deps/npm/doc/cli/npm-tag.md

@@ -10,9 +10,24 @@ npm-tag(1) -- Tag a published version
 Tags the specified version of the package with the specified tag, or the
 `--tag` config if not specified.
 
+A tag can be used when installing packages as a reference to a version instead
+of using a specific version number:
+
+    npm install <name>@<tag>
+
+When installing dependencies, a preferred tagged version may be specified:
+
+    npm install --tag <tag>
+
+This also applies to `npm dedupe`.
+
+Publishing a package always sets the "latest" tag to the published version.
+
 ## SEE ALSO
 
 * npm-publish(1)
+* npm-install(1)
+* npm-dedupe(1)
 * npm-registry(7)
 * npm-config(1)
 * npm-config(7)

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

@@ -146,7 +146,7 @@ See also the `strict-ssl` config.
 
 ### cache
 
-* Default: Windows: `%APPDATA%\npm-cache`, Posix: `~/.npm`
+* Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm`
 * Type: path
 
 The location of npm's cache directory.  See `npm-cache(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; npm@1.3.11</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-bin &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-bugs &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-commands &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-config &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-deprecate &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-docs &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-edit &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-explore &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-help-search &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-init &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-install &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-link &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-load &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-ls &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-outdated &mdash; npm@1.3.12</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; npm@1.3.11</p>
+<p id="footer">npm-owner &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>If no arguments are supplied, then npm packs the current package folder.</p>
 </div>
-<p id="footer">npm-pack &mdash; npm@1.3.11</p>
+<p id="footer">npm-pack &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>This function is not useful programmatically</p>
 </div>
-<p id="footer">npm-prefix &mdash; npm@1.3.11</p>
+<p id="footer">npm-prefix &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Extraneous packages are packages that are not listed on the parent
 package&#39;s dependencies list.</p>
 </div>
-<p id="footer">npm-prune &mdash; npm@1.3.11</p>
+<p id="footer">npm-prune &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li><li><a href="../api/npm-owner.html">npm-owner(3)</a></li></ul>
 </div>
-<p id="footer">npm-publish &mdash; npm@1.3.11</p>
+<p id="footer">npm-publish &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>
 
 <p>See <code>npm help build</code></p>
 </div>
-<p id="footer">npm-rebuild &mdash; npm@1.3.11</p>
+<p id="footer">npm-rebuild &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm-start.html">npm-start(3)</a></li><li><a href="../api/npm-stop.html">npm-stop(3)</a></li></ul>
 </div>
-<p id="footer">npm-restart &mdash; npm@1.3.11</p>
+<p id="footer">npm-restart &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

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

@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>This function is not useful programmatically.</p>
 </div>
-<p id="footer">npm-root &mdash; npm@1.3.11</p>
+<p id="footer">npm-root &mdash; npm@1.3.12</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")