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

Conflicts:
	AUTHORS
	ChangeLog
	configure
	deps/uv/ChangeLog
	deps/uv/src/unix/darwin.c
	deps/uv/src/unix/stream.c
	deps/uv/src/version.c
	deps/v8/src/isolate.cc
	deps/v8/src/version.cc
	lib/http.js
	src/node_version.h

Author: isaacs

AUTHORS

@@ -455,3 +455,4 @@ Benoit Vallée <[email protected]>
 Ryuichi Okumura <[email protected]>
 Brandon Frohs <[email protected]>
 Nick Sullivan <[email protected]>
+Nathan Zadoks <[email protected]>

ChangeLog

@@ -60,6 +60,29 @@
 * zlib: allow passing options to convenience methods (Kyle Robinson Young)
 
 
+2013.05.24, Version 0.10.8 (Stable), 30d9e9fdd9d4c33d3d95a129d021cd8b5b91eddb
+
+* v8: update to 3.14.5.9
+
+* uv: upgrade to 0.10.8
+
+* npm: Upgrade to 1.2.23
+
+* http: remove bodyHead from 'upgrade' events (Nathan Zadoks)
+
+* http: Return true on empty writes, not false (isaacs)
+
+* http: save roundtrips, convert buffers to strings (Ben Noordhuis)
+
+* configure: respect the --dest-os flag consistently (Nathan Rajlich)
+
+* buffer: throw when writing beyond buffer (Trevor Norris)
+
+* crypto: Clear error after DiffieHellman key errors (isaacs)
+
+* string_bytes: strip padding from base64 strings (Trevor Norris)
+
+
 2013.05.17, Version 0.10.7 (Stable), d2fdae197ac542f686ee06835d1153dd43b862e5
 
 * uv: upgrade to v0.10.7

README.md

@@ -5,6 +5,7 @@ Evented I/O for V8 javascript. [![Build Status](https://secure.travis-ci.org/joy
 
 Prerequisites (Unix only):
 
+    * GCC 4.2 or newer
     * Python 2.6 or 2.7
     * GNU Make 3.81 or newer
     * libexecinfo (FreeBSD and OpenBSD only)

benchmark/http/client-request-body.js

@@ -0,0 +1,69 @@
+// Measure the time it takes for the HTTP client to send a request body.
+
+var common = require('../common.js');
+var http = require('http');
+
+var bench = common.createBenchmark(main, {
+  dur: [5],
+  type: ['asc', 'utf', 'buf'],
+  bytes: [32, 256, 1024],
+  method: ['write', 'end  '] // two spaces added to line up each row
+});
+
+function main(conf) {
+  var dur = +conf.dur;
+  var len = +conf.bytes;
+
+  var encoding;
+  var chunk;
+  switch (conf.type) {
+    case 'buf':
+      chunk = new Buffer(len);
+      chunk.fill('x');
+      break;
+    case 'utf':
+      encoding = 'utf8';
+      chunk = new Array(len / 2 + 1).join('ü');
+      break;
+    case 'asc':
+      chunk = new Array(len + 1).join('a');
+      break;
+  }
+
+  var nreqs = 0;
+  var options = {
+    headers: { 'Connection': 'keep-alive', 'Transfer-Encoding': 'chunked' },
+    agent: new http.Agent({ maxSockets: 1 }),
+    host: '127.0.0.1',
+    port: common.PORT,
+    path: '/',
+    method: 'POST'
+  };
+
+  var server = http.createServer(function(req, res) {
+    res.end();
+  });
+  server.listen(options.port, options.host, function() {
+    setTimeout(done, dur * 1000);
+    bench.start();
+    pummel();
+  });
+
+  function pummel() {
+    var req = http.request(options, function(res) {
+      nreqs++;
+      pummel();  // Line up next request.
+      res.resume();
+    });
+    if (conf.method === 'write') {
+      req.write(chunk, encoding);
+      req.end();
+    } else {
+      req.end(chunk, encoding);
+    }
+  }
+
+  function done() {
+    bench.end(nreqs);
+  }
+}

configure

@@ -10,7 +10,8 @@ import sys
 CC = os.environ.get('CC', 'cc')
 
 root_dir = os.path.dirname(__file__)
-sys.path.insert(0, os.path.join(root_dir, 'deps', 'v8', 'tools'))
+sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))
+from gyp.common import GetFlavor
 
 # parse our options
 parser = optparse.OptionParser()
@@ -236,7 +237,7 @@ parser.add_option("--dest-os",
     action="store",
     dest="dest_os",
     help="Operating system to build for. Valid values are: "
-         "win, mac, solaris, freebsd, linux")
+         "win, mac, solaris, freebsd, openbsd, linux")
 
 parser.add_option("--no-ifaddrs",
     action="store_true",
@@ -462,18 +463,18 @@ def configure_node(o):
   # By default, enable DTrace on SunOS systems. Don't allow it on other
   # systems, since it won't work.  (The MacOS build process is different than
   # SunOS, and we haven't implemented it.)
-  if sys.platform.startswith('sunos') or sys.platform.startswith('darwin'):
+  if flavor in ('solaris', 'mac'):
     o['variables']['node_use_dtrace'] = b(not options.without_dtrace)
     o['variables']['uv_use_dtrace'] = o['variables']['node_use_dtrace']
     o['variables']['uv_parent_path'] = '/deps/uv/'
-  elif sys.platform.startswith('linux'):
+  elif flavor == 'linux':
     o['variables']['node_use_dtrace'] = 'false'
     o['variables']['node_use_systemtap'] = b(options.with_dtrace)
     if options.systemtap_includes:
       o['include_dirs'] += [options.systemtap_includes]
   elif options.with_dtrace:
     raise Exception(
-       'DTrace is currently only supported on SunOS or Linux systems.')
+       'DTrace is currently only supported on SunOS, MacOS or Linux systems.')
   else:
     o['variables']['node_use_dtrace'] = 'false'
     o['variables']['node_use_systemtap'] = 'false'
@@ -482,15 +483,15 @@ def configure_node(o):
     o['defines'] += ['SUNOS_NO_IFADDRS']
 
   # By default, enable ETW on Windows.
-  if sys.platform.startswith('win32'):
+  if flavor == 'win':
     o['variables']['node_use_etw'] = b(not options.without_etw);
   elif options.with_etw:
     raise Exception('ETW is only supported on Windows.')
   else:
     o['variables']['node_use_etw'] = 'false'
 
   # By default, enable Performance counters on Windows.
-  if sys.platform.startswith('win32'):
+  if flavor == 'win':
     o['variables']['node_use_perfctr'] = b(not options.without_perfctr);
   elif options.with_perfctr:
     raise Exception('Performance counter is only supported on Windows.')
@@ -603,7 +604,7 @@ def configure_openssl(o):
 
 
 def configure_winsdk(o):
-  if not sys.platform.startswith('win32'):
+  if flavor != 'win':
     return
 
   winsdk_dir = os.environ.get("WindowsSdkDir")
@@ -616,6 +617,13 @@ def configure_winsdk(o):
   print "ctrpp not found in WinSDK path--using pre-gen files from tools/msvs/genfiles."
 
 
+# determine the "flavor" (operating system) we're building for,
+# leveraging gyp's GetFlavor function
+flavor_params = {};
+if (options.dest_os):
+  flavor_params['flavor'] = options.dest_os;
+flavor = GetFlavor(flavor_params);
+
 output = {
   'variables': { 'python': sys.executable },
   'include_dirs': [],
@@ -668,14 +676,12 @@ write('config.mk',
       '# Do not edit. Generated by the configure script.\n' + config)
 
 if options.use_ninja:
-  gyp_args = ['-f', 'ninja']
+  gyp_args = ['-f', 'ninja-' + flavor]
 elif options.use_xcode:
   gyp_args = ['-f', 'xcode']
-elif os.name == 'nt':
+elif flavor == 'win':
   gyp_args = ['-f', 'msvs', '-G', 'msvs_version=auto']
-elif options.dest_os:
-  gyp_args = ['-f', 'make-' + options.dest_os]
 else:
-  gyp_args = ['-f', 'make']
+  gyp_args = ['-f', 'make-' + flavor]
 
 subprocess.call([sys.executable, 'tools/gyp_node'] + gyp_args)

deps/npm/html/api/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">bin &mdash; [email protected].21</p>
+<p id="footer">bin &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">bugs &mdash; [email protected].21</p>
+<p id="footer">bugs &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/commands.html

@@ -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; [email protected].21</p>
+<p id="footer">commands &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">config &mdash; [email protected].21</p>
+<p id="footer">config &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/deprecate.html

@@ -32,7 +32,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; [email protected].21</p>
+<p id="footer">deprecate &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">docs &mdash; [email protected].21</p>
+<p id="footer">docs &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">edit &mdash; [email protected].21</p>
+<p id="footer">edit &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">explore &mdash; [email protected].21</p>
+<p id="footer">explore &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">help-search &mdash; [email protected].21</p>
+<p id="footer">help-search &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/init.html

@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <p><a href="../doc/json.html">json(1)</a></p>
 </div>
-<p id="footer">init &mdash; [email protected].21</p>
+<p id="footer">init &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">install &mdash; [email protected].21</p>
+<p id="footer">install &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">link &mdash; [email protected].21</p>
+<p id="footer">link &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">load &mdash; [email protected].21</p>
+<p id="footer">load &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">ls &mdash; [email protected].21</p>
+<p id="footer">ls &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/npm.html

@@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <h2 id="VERSION">VERSION</h2>
 
-<p>1.2.21</p>
+<p>1.2.23</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -92,7 +92,7 @@ <h2 id="ABBREVS">ABBREVS</h2>
 
 <pre><code>var cmd = npm.deref(&quot;unp&quot;) // cmd === &quot;unpublish&quot;</code></pre>
 </div>
-<p id="footer">npm &mdash; [email protected].21</p>
+<p id="footer">npm &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">outdated &mdash; [email protected].21</p>
+<p id="footer">outdated &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/owner.html

@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
 </div>
-<p id="footer">owner &mdash; [email protected].21</p>
+<p id="footer">owner &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/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">pack &mdash; [email protected].21</p>
+<p id="footer">pack &mdash; [email protected].23</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/prefix.html

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