Merge branch 'v0.6'

Conflicts: Makefile src/node_version.h test/simple/test-http-response-no-headers.js
nodejs · Nov 25, 2011 · cffd0bb · cffd0bb
2 parents 1db9a2a + b159c6d
commit cffd0bb
Show file tree

Hide file tree

Showing 170 changed files with 2,234 additions and 6,953 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,5 @@ ipch/
 *-nodegyp*
 /gyp-mac-tool
 /dist-osx
+/npm.wxs
+/tools/msvs/npm.wixobj
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,30 @@
-2011.11.18, Version 0.6.2 (stable)
+2011.11.25, Version 0.6.3 (stable)
+
+* #2083 Land NPM in Node. It is included in packages/installers and installed
+  on `make install`.
+
+* #2076 Add logos to windows installer.
+
+* #1711 Correctly handle http requests without headers. (Ben Noordhuis,
+  Felix Geisendörfer)
+
+* TLS: expose more openssl SSL context options and constants. (Ben Noordhuis)
+
+* #2177 Windows: don't kill UDP socket when a packet fails to reach its
+  destination. (Bert Belder)
+
+* Windows: support paths longer than 260 characters. (Igor Zinkovsky)
+
+* Windows: correctly resolve drive-relative paths. (Bert Belder)
+
+* #2166 Don't leave file descriptor open after lchmod. (Isaac Schlueter)
+
+* #2084 Add OS X .pkg build script to make file.
+
+* #2160 Documentation improvements. (Ben Noordhuis)
+
+
+2011.11.18, Version 0.6.2 (stable), a4402f0b2e410b19375a1d5c5fb7fe7f66f3c7f8
 
  * doc improvements (Artur Adib, Trevor Burnham, Ryan Emery, Trent Mick)
 
@@ -23,7 +49,7 @@
  * Upgrade V8 to 3.6.6.8
 
 
-2011.11.11, Version 0.6.1 (stable)
+2011.11.11, Version 0.6.1 (stable), 170f2addb2dd0c625bc4a6d461e89a31ad68b79b
 
 * doc improvements (Eric Lovett, Ben Noordhuis, Scott Anderson, Yoji SHIDARA)
 
@@ -114,7 +140,7 @@
 * Documentation improvments (Igor Zinkovsky, Bert Belder, Ilya Dmitrichenko,
 koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 
-* Performance improvements (Daniel Ennis, Bert Belder, Ben Noordhuis) 
+* Performance improvements (Daniel Ennis, Bert Belder, Ben Noordhuis)
 
 * Long process.title support (Ben Noordhuis)
 
@@ -370,7 +396,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 
 * Fixes https host header default port handling. (Mikeal Rogers)
 
-* #1440 strip byte order marker when loading *.js and *.json files 
+* #1440 strip byte order marker when loading *.js and *.json files
   (Ben Noordhuis)
 
 * #1434 Improve util.format() compatibility with browser. (Koichi Kobayashi)
@@ -581,9 +607,9 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 
 * #829 Backport r8577 from V8 (Ben Noordhuis)
 
-* #877 Don't wait for HTTP Agent socket pool to establish connections. 
+* #877 Don't wait for HTTP Agent socket pool to establish connections.
 
-* #915 Find kqueue on FreeBSD correctly (Brett Kiefer) 
+* #915 Find kqueue on FreeBSD correctly (Brett Kiefer)
 
 * #1085 HTTP: Fix race in abort/dispatch code (Stefan Rusu)
 
@@ -980,7 +1006,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 
 * HTTPS server
 
-* Built in debugger 'node debug script.js' 
+* Built in debugger 'node debug script.js'
 
 * realpath files during module load (Mihai Călin Bazon)
 
@@ -1122,7 +1148,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 
 * fs bugfixes (Tj Holowaychuk, Tobie Langel, Marco Rogers, isaacs)
 
-* http bug fixes (Fedor Indutny, Mikeal Rogers) 
+* http bug fixes (Fedor Indutny, Mikeal Rogers)
 
 * Faster buffers; breaks C++ API (Tim-Smart, Stéphan Kochen)
 
@@ -1291,7 +1317,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 * Upgrade http-parser, V8 to 2.2.21
 
 
-2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78 
+2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78
 
 * Datagram sockets (Paul Querna)
 
@@ -1397,7 +1423,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 
 2010.05.06, Version 0.1.94, f711d5343b29d1e72e87107315708e40951a7826
 
-* Look in /usr/local/lib/node for modules, so that there's a way 
+* Look in /usr/local/lib/node for modules, so that there's a way
   to install modules globally (Issac Schlueter)
 
 * SSL improvements (Rhys Jones, Paulo Matias)
@@ -1417,7 +1443,7 @@ koichik, Maciej Małecki, Guglielmo Ferri, isaacs)
 * Bugfix: destroy() instead of end() http connection at end of
   pipeline
 
-* Bugfix: http.Client may be prematurely released back to the 
+* Bugfix: http.Client may be prematurely released back to the
   free pool.  (Thomas Lee)
 
 * Upgrade V8 to 2.2.8

diff --git a/deps/npm/.gitmodules b/deps/npm/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "node_modules/mkdirp"]
 	path = node_modules/mkdirp
 	url = git://github.com/isaacs/node-mkdirp.git
+[submodule "node_modules/fast-list"]
+	path = node_modules/fast-list
+	url = git://github.com/isaacs/fast-list.git
diff --git a/deps/npm/doc/cli/coding-style.md b/deps/npm/doc/cli/coding-style.md
@@ -155,16 +155,16 @@ Use appropriate log levels.  The default log() function logs at the
 
 ## Case, naming, etc.
 
-Use lowerCamelCase for multiword identifiers when they refer to objects,
+Use `lowerCamelCase` for multiword identifiers when they refer to objects,
 functions, methods, members, or anything not specified in this section.
 
-Use UpperCamelCase for class names (things that you'd pass to "new").
+Use `UpperCamelCase` for class names (things that you'd pass to "new").
 
-Use all-lower-hyphen-css-case for multiword filenames and config keys.
+Use `all-lower-hyphen-css-case` for multiword filenames and config keys.
 
 Use named functions.  They make stack traces easier to follow.
 
-Use CAPS_SNAKE_CASE for constants, things that should never change
+Use `CAPS_SNAKE_CASE` for constants, things that should never change
 and are rarely used.
 
 Use a single uppercase letter for function names where the function

diff --git a/deps/npm/lib/completion.js b/deps/npm/lib/completion.js
@@ -20,7 +20,7 @@ var output = require("./utils/output.js")
 completion.completion = function (opts, cb) {
   if (opts.w > 3) return cb()
 
-  var fs = require("fs")
+  var fs = require("graceful-fs")
     , path = require("path")
     , bashExists = null
     , zshExists = null

diff --git a/deps/npm/lib/utils/tar.js b/deps/npm/lib/utils/tar.js
@@ -76,16 +76,10 @@ function packFiles (targetTarball, parent, files, pkg, cb) {
                  , path: parent
                  , filter: function () {
                      return -1 !== files.indexOf(this.path)
-                          // || (this.type === "Directory" &&
-                          //     this.basename !== ".git")
-
                    }
                  })
     .on("error", log.er(cb, "error reading "+parent))
-    .on("entry", function E (entry) {
-      entry.on("entry", E)
-    })
-    .pipe(tar.Pack({}))
+    .pipe(tar.Pack())
     .on("error", log.er(cb, "tar creation error "+targetTarball))
     .pipe(zlib.Gzip())
     .on("error", log.er(cb, "gzip error "+targetTarball))
@@ -155,8 +149,9 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
   log.silly([dMode.toString(8), fMode.toString(8)], "gunzTarPerm modes")
 
   fs.createReadStream(tarball)
+    .on("error", log.er(cb, "error reading "+tarball))
     .pipe(zlib.Unzip())
-    .on("error", log.er(cb, "unzip error"))
+    .on("error", log.er(cb, "unzip error "+tarball))
     .pipe(tar.Extract({ type: "Directory", path: tmp }))
     .on("error", log.er(cb, "Failed unpacking "+tarball))
     .on("close", afterUntar)
@@ -165,6 +160,7 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
   // XXX Do all this in an Extract filter.
   //
   function afterUntar (er) {
+    log.silly(er, "afterUntar")
     // if we're not doing ownership management,
     // then we're done now.
     if (er) return log.er(cb, "Failed unpacking "+tarball)(er)

diff --git a/deps/npm/node_modules/abbrev/LICENSE b/deps/npm/node_modules/abbrev/LICENSE
diff --git a/deps/npm/node_modules/abbrev/package.json b/deps/npm/node_modules/abbrev/package.json
diff --git a/deps/npm/node_modules/block-stream/bench/block-stream.js b/deps/npm/node_modules/block-stream/bench/block-stream.js
diff --git a/deps/npm/node_modules/block-stream/bench/dropper-pause.js b/deps/npm/node_modules/block-stream/bench/dropper-pause.js