Merge branch 'v0.6.19-release' into v0.6

nodejs · Jun 6, 2012 · 79d77cf · 79d77cf
2 parents cb76999 + debf552
commit 79d77cf
Show file tree

Hide file tree

Showing 251 changed files with 780 additions and 3,287 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -277,3 +277,4 @@ Dane Springmeyer <dane@dbsgeo.com>
 Sambasiva Suda <sambasivarao@gmail.com>
 Vincent Voyer <v@fasterize.com>
 ANDO Takahiro <takahiro.ando@gmail.com>
+Erwin van der Koogh <github@koogh.com>
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,21 @@
-2012.05.15 Version 0.6.18 (stable)
+2012.06.06 Version 0.6.19 (stable)
+
+* npm: upgrade to 1.1.24
+
+* fs: no end emit after createReadStream.pause() (Andreas Madsen)
+
+* vm: cleanup module memory leakage (Marcel Laverdet)
+
+* unix: fix loop starvation under high network load (Ben Noordhuis)
+
+* unix: remove abort() in ev_unref() (Ben Noordhuis)
+
+* windows/tty: never report error after forcibly aborting line-buffered read (Bert Belder)
+
+* windows: skip GetFileAttributes call when opening a file (Bert Belder)
+
+
+2012.05.15 Version 0.6.18 (stable), 4bc1d395de6abed2cf1e4d0b7b3a1480a21c368f
 
 * windows: skip GetFileAttributes call when opening a file (Bert Belder)
 

diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore
@@ -12,6 +12,9 @@ npm-debug.log
 .gitignore
 release/
 
+# don't need these in the npm package.
+html/*.png
+
 # don't ignore .npmignore files
 # these are used in some tests.
 !.npmignore
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -65,3 +65,4 @@ Jens Grunert <jens.grunert@gmail.com>
 Joost-Wim Boekesteijn <joost-wim@boekesteijn.nl>
 Dalmais Maxence <github@maxired.fr>
 Marcus Ekwall <marcus.ekwall@gmail.com>
+Aaron Stacy <aaron.r.stacy@gmail.com>
diff --git a/deps/npm/Makefile b/deps/npm/Makefile
@@ -121,6 +121,8 @@ docpublish: doc-publish
 doc-publish: doc
 	rsync -vazu --stats --no-implied-dirs --delete html/doc/ npmjs.org:/var/www/npmjs.org/public/doc
 	rsync -vazu --stats --no-implied-dirs --delete html/api/ npmjs.org:/var/www/npmjs.org/public/api
+	rsync -vazu --stats --no-implied-dirs --delete html/webfonts/ npmjs.org:/var/www/npmjs.org/public/webfonts
+	scp html/style.css npmjs.org:/var/www/npmjs.org/public/
 
 zip-publish: release
 	scp release/* npmjs.org:/var/www/npmjs.org/public/dist/

diff --git a/deps/npm/doc/cli/json.md b/deps/npm/doc/cli/json.md
@@ -394,6 +394,7 @@ Git urls can be of the form:
 
     git://github.com/user/project.git#commit-ish
     git+ssh://user@hostname:project.git#commit-ish
+    git+ssh://user@hostname/project.git#commit-ish
     git+http://user@hostname/project/blah.git#commit-ish
     git+https://user@hostname/project/blah.git#commit-ish
 
@@ -420,6 +421,36 @@ Array of package names that will be bundled when publishing the package.
 
 If this is spelled `"bundleDependencies"`, then that is also honorable.
 
+## optionalDependencies
+
+If a dependency can be used, but you would like npm to proceed if it
+cannot be found or fails to install, then you may put it in the
+`optionalDependencies` hash.  This is a map of package name to version
+or url, just like the `dependencies` hash.  The difference is that
+failure is tolerated.
+
+It is still your program's responsibility to handle the lack of the
+dependency.  For example, something like this:
+
+    try {
+      var foo = require('foo')
+      var fooVersion = require('foo/package.json').version
+    } catch (er) {
+      foo = null
+    }
+    if ( notGoodFooVersion(fooVersion) ) {
+      foo = null
+    }
+
+    // .. then later in your program ..
+
+    if (foo) {
+      foo.doFooThings()
+    }
+
+Entries in `optionalDependencies` will override entries of the same name in
+`dependencies`, so it's usually best to only put in one place.
+
 ## engines
 
 You can specify the version of

diff --git a/deps/npm/html/api/GubbleBum-Blocky.ttf b/deps/npm/html/api/GubbleBum-Blocky.ttf
diff --git a/deps/npm/html/api/author.html b/deps/npm/html/api/author.html
diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html
@@ -2,7 +2,7 @@
 <html>
   <title>bin</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -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">bin &mdash; npm@1.1.21</p>
+<p id="footer">bin &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/bugs.html b/deps/npm/html/api/bugs.html
@@ -2,7 +2,7 @@
 <html>
   <title>bugs</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -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">bugs &mdash; npm@1.1.21</p>
+<p id="footer">bugs &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/commands.html b/deps/npm/html/api/commands.html
@@ -2,7 +2,7 @@
 <html>
   <title>commands</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../doc/index.html">index(1)</a></li></ul>
 </div>
-<p id="footer">commands &mdash; npm@1.1.21</p>
+<p id="footer">commands &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/config.html b/deps/npm/html/api/config.html
@@ -2,7 +2,7 @@
 <html>
   <title>config</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -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">config &mdash; npm@1.1.21</p>
+<p id="footer">config &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/deprecate.html b/deps/npm/html/api/deprecate.html
@@ -2,7 +2,7 @@
 <html>
   <title>deprecate</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
 </div>
-<p id="footer">deprecate &mdash; npm@1.1.21</p>
+<p id="footer">deprecate &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/docs.html b/deps/npm/html/api/docs.html
@@ -2,7 +2,7 @@
 <html>
   <title>docs</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -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">docs &mdash; npm@1.1.21</p>
+<p id="footer">docs &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/edit.html b/deps/npm/html/api/edit.html
@@ -2,7 +2,7 @@
 <html>
   <title>edit</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -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">edit &mdash; npm@1.1.21</p>
+<p id="footer">edit &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/explore.html b/deps/npm/html/api/explore.html
@@ -2,7 +2,7 @@
 <html>
   <title>explore</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="./style.css">
+  <link rel="stylesheet" type="text/css" href="../style.css">
 
   <body>
     <div id="wrapper">
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>The first element in the 'args' 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">explore &mdash; npm@1.1.21</p>
+<p id="footer">explore &mdash; npm@1.1.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

diff --git a/deps/npm/html/api/find.html b/deps/npm/html/api/find.html