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

ChangeLog

@@ -1,4 +1,28 @@
-2012.03.02 Version 0.6.12 (stable)
+2012.03.15 Version 0.6.13 (stable)
+
+* Windows: Many libuv test fixes (Bert Belder)
+
+* Windows: avoid uv_guess_handle crash in when fd < 0 (Bert Belder)
+
+* Map EBUSY and ENOTEMPTY errors (Bert Belder)
+
+* Windows: include syscall in fs errors (Bert Belder)
+
+* Fix fs.watch ENOSYS on Linux kernel version mismatch (Ben Noordhuis)
+
+* Update npm to 1.1.9
+  - upgrade node-gyp to 0.3.5 (Nathan Rajlich)
+  - Fix isaacs/npm#2249 Add cache-max and cache-min configs
+  - Properly redirect across https/http registry requests
+  - log config usage if undefined key in set function (Kris Windham)
+  - Add support for os/cpu fields in package.json (Adam Blackburn)
+  - Automatically node-gyp packages containing a binding.gyp
+  - Fix failures unpacking in UNC shares
+  - Never create un-listable directories
+  - Handle cases where an optionalDependency fails to build
+
+
+2012.03.02 Version 0.6.12 (stable), 48a2d34cfe6b7e1c9d15202a4ef5e3c82d1fba35
 
 * Upgrade V8 to 3.6.6.24
 

Makefile

@@ -102,7 +102,7 @@ website_files = \
 	out/doc/logos/index.html \
 	$(doc_images)
 
-doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/
+doc: program $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/
 
 $(apidoc_dirs):
 	mkdir -p $@

deps/uv/src/unix/linux.c

@@ -170,11 +170,16 @@ uint64_t uv_get_total_memory(void) {
 #if HAVE_INOTIFY_INIT || HAVE_INOTIFY_INIT1
 
 static int new_inotify_fd(void) {
-#if HAVE_INOTIFY_INIT1
-  return inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
-#else
   int fd;
 
+#if HAVE_INOTIFY_INIT1
+  fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
+  if (fd != -1)
+    return fd;
+  if (errno != ENOSYS)
+    return -1;
+#endif
+
   if ((fd = inotify_init()) == -1)
     return -1;
 
@@ -184,7 +189,6 @@ static int new_inotify_fd(void) {
   }
 
   return fd;
-#endif
 }
 
 

deps/uv/test/test-ref.c

@@ -45,7 +45,7 @@ static void write_unref_cb(uv_connect_t* req, int status) {
   ASSERT(status == 0);
 
   uv_write(&write_req, req->handle, &buf, 1, (uv_write_cb) fail_cb);
-  uv_unref(uv_default_loop()); // uv_write refs the loop
+  uv_unref(uv_default_loop()); /* uv_write refs the loop */
 }
 
 
@@ -55,7 +55,7 @@ static void shutdown_unref_cb(uv_connect_t* req, int status) {
   ASSERT(status == 0);
 
   uv_shutdown(&shutdown_req, req->handle, (uv_shutdown_cb) fail_cb);
-  uv_unref(uv_default_loop()); // uv_shutdown refs the loop
+  uv_unref(uv_default_loop()); /* uv_shutdown refs the loop */
 }
 
 

deps/uv/test/test-tty.c

@@ -25,7 +25,7 @@
 #ifdef _WIN32
 # include <io.h>
 # include <windows.h>
-#else // Unix
+#else /*  Unix */
 # include <fcntl.h>
 # include <unistd.h>
 #endif
@@ -37,7 +37,7 @@ TEST_IMPL(tty) {
   uv_tty_t tty_in, tty_out;
   uv_loop_t* loop = uv_default_loop();
 
-  // Make sure we have an FD that refers to a tty
+  /* Make sure we have an FD that refers to a tty */
 #ifdef _WIN32
   HANDLE handle;
   handle = CreateFileA("conin$",

doc/about/index.html

@@ -130,7 +130,7 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.12/LICENSE">license</a>.</p>
+        <p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">license</a>.</p>
     </div>
 
 

doc/community/index.html

@@ -180,7 +180,7 @@
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.12/LICENSE">license</a>.</p>
+        <p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">license</a>.</p>
     </div>
 
     <script>

doc/index.html

@@ -31,7 +31,7 @@
 
         <a href="#download" class="button" id="downloadbutton">Download</a>
         <a href="http://nodejs.org/api/index.html" class="button" id="docsbutton">Docs</a>
-        <p class="version">v0.6.12</p>
+        <p class="version">v0.6.13</p>
     </div>
     <div id="quotes" class="clearfix">
         <h2>Node.js in the Industry</h2>
@@ -78,15 +78,15 @@
         <a href="#" id="download-close">X</a>
         <img id="download-logo" src="http://nodejs.org/images/download-logo.png" alt="node.js">
         <ul id="installers" class="clearfix">
-            <li><a href="http://nodejs.org/dist/v0.6.12/node-v0.6.12.msi">Windows Installer</a><br>node-v0.6.12.msi</li>
-            <li><a href="http://nodejs.org/dist/v0.6.12/node-v0.6.12.pkg">Macintosh Installer</a><br>node-v0.6.12.pkg</li>
-            <li id="source"><a href="http://nodejs.org/dist/v0.6.12/node-v0.6.12.tar.gz">Source Code</a><br>node-v0.6.12.tar.gz</li>
+            <li><a href="http://nodejs.org/dist/v0.6.13/node-v0.6.13.msi">Windows Installer</a><br>node-v0.6.13.msi</li>
+            <li><a href="http://nodejs.org/dist/v0.6.13/node-v0.6.13.pkg">Macintosh Installer</a><br>node-v0.6.13.pkg</li>
+            <li id="source"><a href="http://nodejs.org/dist/v0.6.13/node-v0.6.13.tar.gz">Source Code</a><br>node-v0.6.13.tar.gz</li>
         </ul>
         <ul id="documentation">
-            <li><a href="https://raw.github.com/joyent/node/v0.6.12/ChangeLog">Change Log</a></li>
-            <li><a href="http://nodejs.org/docs/v0.6.12/api/index.html">Documentation</a></li>
-            <li><a href="http://nodejs.org/dist/v0.6.12">Other release files</a></li>
-            <li><a href="https://raw.github.com/joyent/node/v0.6.12/LICENSE">License</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.6.13/ChangeLog">Change Log</a></li>
+            <li><a href="http://nodejs.org/docs/v0.6.13/api/index.html">Documentation</a></li>
+            <li><a href="http://nodejs.org/dist/v0.6.13">Other release files</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">License</a></li>
             <li><a href="https://github.com/joyent/node">Git Repository</a></li>
             <li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
             with a Package Manager</a>
@@ -211,7 +211,7 @@ server.listen(1337, '127.0.0.1');</pre>
             <!-- <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> -->
         </ul>
 
-        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.12/LICENSE">license</a>.</p>
+        <p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">license</a>.</p>
     </div>
 
 

doc/logos/index.html

@@ -82,7 +82,7 @@
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.12/LICENSE">View License</a></p>
+        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">View License</a></p>
     </div>
 
     <script>

doc/template.html

@@ -66,7 +66,7 @@
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright 2010 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
+        <p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
     </div>
 
   <script src="../sh_main.js"></script>

src/node_version.h

@@ -29,7 +29,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 6
 #define NODE_PATCH_VERSION 13
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)