Merge remote branch 'origin/v0.6'

Conflicts: Makefile src/node_version.h test/simple/test-crypto.js
nodejs · Nov 22, 2011 · 8595981 · 8595981
2 parents b3f91f1 + 3abebfe
commit 8595981
Show file tree

Hide file tree

Showing 483 changed files with 33,629 additions and 146 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,28 @@
+2011.11.18, Version 0.6.2 (stable)
+
+ * doc improvements (Artur Adib, Trevor Burnham, Ryan Emery, Trent Mick)
+
+ * timers: remember extra setTimeout() arguments when timeout==0
+
+ * punycode: use Mathias Bynens's punycode library, it's more compliant
+
+ * repl: improved tab completion (Ryan Emery)
+
+ * buffer: fix range checks in .writeInt() functions (Lukasz Walukiewicz)
+
+ * tls: make cipher list configurable
+
+ * addons: make Buffer and ObjectWrap visible to Windows add-ons (Bert Belder)
+
+ * crypto: add PKCS#1 a.k.a RSA public key verification support
+
+ * windows: fix stdout writes when redirected to nul
+
+ * sunos: fix build on Solaris and Illumos
+
+ * Upgrade V8 to 3.6.6.8
+
+
 2011.11.11, Version 0.6.1 (stable)
 
 * doc improvements (Eric Lovett, Ben Noordhuis, Scott Anderson, Yoji SHIDARA)

diff --git a/LICENSE b/LICENSE
@@ -78,3 +78,9 @@ The externally maintained libraries used by Node are:
   - deps/zlib copyright 1995-2010 Jean-loup Gailly and Mark Adler
     licensed under a permissive free software license. See
     deps/zlib/LICENSE.
+
+  - deps/npm NPM is a package manager program copyright 2009, 2010, 2011
+    Isaac Z. Schlueter and licensed under MIT. NPM includes several
+    subpackages MIT or Apache licenses, see deps/npm/LICENSE for more
+    information. NPM is included in the Node .msi and .pkg distributions
+    but not in the Node binary itself.
diff --git a/deps/http_parser/.gitignore b/deps/http_parser/.gitignore
@@ -3,6 +3,3 @@ tags
 test
 test_g
 test_fast
-http_parser.Makefile
-http_parser.target.mk
-test.target.mk
diff --git a/deps/http_parser/CMakeLists.txt b/deps/http_parser/CMakeLists.txt
diff --git a/deps/http_parser/http_parser.c b/deps/http_parser/http_parser.c
@@ -370,6 +370,13 @@ size_t http_parser_execute (http_parser *parser,
   uint64_t index = parser->index;
   uint64_t nread = parser->nread;
 
+  /* technically we could combine all of these (except for url_mark) into one
+     variable, saving stack space, but it seems more clear to have them
+     separated. */
+  const char *header_field_mark = 0;
+  const char *header_value_mark = 0;
+  const char *url_mark = 0;
+
   /* We're in an error state. Don't bother doing anything. */
   if (HTTP_PARSER_ERRNO(parser) != HPE_OK) {
     return 0;
@@ -396,12 +403,6 @@ size_t http_parser_execute (http_parser *parser,
     }
   }
 
-  /* technically we could combine all of these (except for url_mark) into one
-     variable, saving stack space, but it seems more clear to have them
-     separated. */
-  const char *header_field_mark = 0;
-  const char *header_value_mark = 0;
-  const char *url_mark = 0;
 
   if (state == s_header_field)
     header_field_mark = data;
@@ -514,7 +515,7 @@ size_t http_parser_execute (http_parser *parser,
         break;
 
       case s_res_first_http_major:
-        if (ch < '1' || ch > '9') {
+        if (ch < '0' || ch > '9') {
           SET_ERRNO(HPE_INVALID_VERSION);
           goto error;
         }
@@ -690,12 +691,13 @@ size_t http_parser_execute (http_parser *parser,
 
       case s_req_method:
       {
+        const char *matcher;
         if (ch == '\0') {
           SET_ERRNO(HPE_INVALID_METHOD);
           goto error;
         }
 
-        const char *matcher = method_strings[parser->method];
+        matcher = method_strings[parser->method];
         if (ch == ' ' && matcher[index] == '\0') {
           state = s_req_spaces_before_url;
         } else if (ch == matcher[index]) {

diff --git a/deps/http_parser/http_parser.gyp b/deps/http_parser/http_parser.gyp
@@ -5,24 +5,69 @@
 #   ./gyp/gyp -f make --depth=`pwd` http_parser.gyp 
 #   ./out/Debug/test 
 {
+  'target_defaults': {
+    'default_configuration': 'Debug',
+    'configurations': {
+      # TODO: hoist these out and put them somewhere common, because
+      #       RuntimeLibrary MUST MATCH across the entire project
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 1, # static debug
+          },
+        },
+      },
+      'Release': {
+        'defines': [ 'NDEBUG' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 0, # static release
+          },
+        },
+      }
+    },
+    'msvs_settings': {
+      'VCCLCompilerTool': {
+      },
+      'VCLibrarianTool': {
+      },
+      'VCLinkerTool': {
+        'GenerateDebugInformation': 'true',
+      },
+    },
+    'conditions': [
+      ['OS == "win"', {
+        'defines': [
+          'WIN32'
+        ],
+      }]
+    ],
+  },
+
   'targets': [
     {
       'target_name': 'http_parser',
-      'type': '<(library)',
+      'type': 'static_library',
       'include_dirs': [ '.' ],
       'direct_dependent_settings': {
         'include_dirs': [ '.' ],
       },
       'defines': [ 'HTTP_PARSER_STRICT=0' ],
       'sources': [ './http_parser.c', ],
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          # Compile as C++. http_parser.c is actually C99, but C++ is
-          # close enough in this case.
-          'CompileAs': 2, # compile as C++
-        },
-      },
+      'conditions': [
+        ['OS=="win"', {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # Compile as C++. http_parser.c is actually C99, but C++ is
+              # close enough in this case.
+              'CompileAs': 2,
+            },
+          },
+        }]
+      ],
     },
+
     {
       'target_name': 'test',
       'type': 'executable',

diff --git a/deps/http_parser/http_parser.h b/deps/http_parser/http_parser.h
@@ -222,7 +222,7 @@ struct http_parser {
    * Should be checked when http_parser_execute() returns in addition to
    * error checking.
    */
-  char upgrade : 1;
+  unsigned char upgrade : 1;
 
 #if HTTP_PARSER_DEBUG
   uint32_t error_lineno;

diff --git a/deps/http_parser/test.c b/deps/http_parser/test.c
@@ -1041,8 +1041,24 @@ const struct message responses[] =
   ,.body= ""
   }
 
-
+#define HTTP_VERSION_0_9 12
+/* Should handle HTTP/0.9 */
+, {.name= "http version 0.9"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/0.9 200 OK\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 0
+  ,.http_minor= 9
+  ,.status_code= 200
+  ,.num_headers= 0
+  ,.headers=
+    {}
+  ,.body= ""
+  }
 , {.name= NULL } /* sentinel */
+
 };
 
 int

diff --git a/deps/npm/.gitignore b/deps/npm/.gitignore
@@ -0,0 +1,15 @@
+*.swp
+test/bin
+test/output.log
+test/packages/*/node_modules
+test/packages/npm-test-depends-on-spark/which-spark.log
+test/packages/test-package/random-data.txt
+test/root
+node_modules/ronn
+node_modules/.bin
+npm-debug.log
+html/api/*.html
+html/doc/*.html
+man/
+doc/*/index.md
+./npmrc
diff --git a/deps/npm/.gitmodules b/deps/npm/.gitmodules
@@ -0,0 +1,51 @@
+[submodule "node_modules/semver"]
+	path = node_modules/semver
+	url = https://github.com/isaacs/node-semver.git
+[submodule "node_modules/abbrev"]
+	path = node_modules/abbrev
+	url = https://github.com/isaacs/abbrev-js.git
+[submodule "node_modules/nopt"]
+	path = node_modules/nopt
+	url = https://github.com/isaacs/nopt.git
+[submodule "node_modules/node-uuid"]
+	path = node_modules/node-uuid
+	url = https://github.com/broofa/node-uuid
+[submodule "node_modules/minimatch"]
+	path = node_modules/minimatch
+	url = https://github.com/isaacs/minimatch.git
+[submodule "node_modules/graceful-fs"]
+	path = node_modules/graceful-fs
+	url = https://github.com/isaacs/node-graceful-fs.git
+[submodule "node_modules/slide"]
+	path = node_modules/slide
+	url = https://github.com/isaacs/slide-flow-control.git
+[submodule "node_modules/rimraf"]
+	path = node_modules/rimraf
+	url = https://github.com/isaacs/rimraf.git
+[submodule "node_modules/proto-list"]
+	path = node_modules/proto-list
+	url = https://github.com/isaacs/proto-list.git
+[submodule "node_modules/ini"]
+	path = node_modules/ini
+	url = https://github.com/isaacs/ini.git
+[submodule "node_modules/which"]
+	path = node_modules/which
+	url = https://github.com/isaacs/node-which.git
+[submodule "node_modules/request"]
+	path = node_modules/request
+	url = https://github.com/isaacs/request.git
+[submodule "node_modules/tar"]
+	path = node_modules/tar
+	url = git://github.com/isaacs/node-tar.git
+[submodule "node_modules/fstream"]
+	path = node_modules/fstream
+	url = git://github.com/isaacs/fstream.git
+[submodule "node_modules/inherits"]
+	path = node_modules/inherits
+	url = git://github.com/isaacs/inherits.git
+[submodule "node_modules/block-stream"]
+	path = node_modules/block-stream
+	url = git://github.com/isaacs/block-stream.git
+[submodule "node_modules/mkdirp"]
+	path = node_modules/mkdirp
+	url = git://github.com/isaacs/node-mkdirp.git
diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore
@@ -0,0 +1,11 @@
+*.swp
+test/bin
+test/output.log
+test/packages/*/node_modules
+test/packages/npm-test-depends-on-spark/which-spark.log
+test/packages/test-package/random-data.txt
+test/root
+node_modules/ronn
+node_modules/.bin
+npm-debug.log
+./npmrc
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -0,0 +1,50 @@
+# Authors sorted by whether or not they're me
+Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
+Steve Steiner <ssteinerX@gmail.com> (http://websaucesoftware.com/blog/)
+Mikeal Rogers <mikeal.rogers@gmail.com> (http://www.mikealrogers.com/)
+Aaron Blohowiak <aaron.blohowiak@gmail.com> (http://aaronblohowiak.com/)
+Martyn Smith <martyn@dollyfish.net.nz> (http://dollyfish.net.nz/)
+Mathias Pettersson <mape@mape.me> (http://mape.me/)
+Brian Hammond <brian@fictorial.com> (http://fictorial.com/)
+Charlie Robbins <charlie.robbins@gmail.com> (http://www.charlierobbins.com/)
+Francisco Treacy <francisco.treacy@gmail.com> (http://franciscotreacy.com/)
+Cliffano Subagio <cliffano@gmail.com> (http://blog.cliffano.com/)
+Christian Eager <christian.eager@nokia.com> (http://perpenduum.com)
+Dav Glass <davglass@gmail.com> (http://blog.davglass.com)
+Alex K. Wolfe <alexkwolfe@gmail.com>
+James Sanders <jimmyjazz14@gmail.com> (http://james-sanders.com/)
+Reid Burke <me@reidburke.com> (http://reidburke.com/)
+Arlo Breault <arlolra@gmail.com> (http://thoughtherder.com/)
+Timo Derstappen <teemow@gmail.com> (http://teemow.com)
+Bradley Meck <bradley.meck@gmail.com>
+Bart Teeuwisse <bart.teeuwisse@thecodemill.biz> (http://thecodemill.biz/)
+Ben Noordhuis <info@bnoordhuis.nl> (http://bnoordhuis.nl/)
+Tor Valamo <tor.valamo@gmail.com> (http://www.magnimedia.no/)
+Whyme.Lyu <5longluna@gmail.com> (http://whyme.kuantu.com/)
+Olivier Melcher <olivier.melcher@gmail.com>
+Tomaž Muraus <kami@k5-storitve.net> (http://www.tomaz-muraus.info)
+Evan Meagher <evan.meagher@gmail.com> (http://evanmeagher.net/)
+Orlando Vazquez <ovazquez@gmail.com> (http://2wycked.net/)
+George Miroshnykov <gmiroshnykov@lohika.com>
+Geoff Flarity (http://ca.linkedin.com/pub/geoff-flarity/a/536/43a)
+Pete Kruckenberg <pete@kruckenberg.com>
+Laurie Harper <laurie@holoweb.net> (http://laurie.holoweb.net/)
+Chris Wong <chris@chriswongstudio.com>
+Max Goodman <c@chromacode.com> (http://chromacode.com/)
+Scott Bronson <brons_github@rinspin.com>
+Federico Romero <federomero@gmail.com>
+Visnu Pitiyanuvath <visnupx@gmail.com> (http://visnup.com)
+Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com/)
+Mark Cahill <mark@tiemonster.info> (http://www.tiemonster.info/)
+Zearin <zearin@gonk.net>
+Iain Sproat <iainsproat@gmail.com>
+Trent Mick <trentm@gmail.com> (http://trentm.com/)
+Felix Geisendörfer <felix@debuggable.com> (http://www.debuggable.com/)
+Conny Brunnkvist <cbrunnkvist@gmail.com> (http://twitter.com/connyb)
+Will Elwood <w.elwood08@gmail.com> (https://github.com/welwood08)
+Oleg Efimov <efimovov@gmail.com> (http://sannis.ru)
+Martin Cooper <mfncooper@gmail.com>
+Jameson Little <t.jameson.little@gmail.com>
+cspotcode <cspotcode@gmail.com>
+Maciej Małecki <maciej.malecki@notimplemented.org>
+Stephen Sugden <glurgle@gmail.com>
diff --git a/deps/npm/CHANGES b/deps/npm/CHANGES
@@ -0,0 +1 @@
+doc/cli/changelog.md