2013.04.09, Version 0.8.23 (maintenance)

* npm: Upgrade to v1.2.18 * http: Avoid EE warning on ECONNREFUSED handling (isaacs) * tls: Re-enable check of CN-ID in cert verification (Tobias Müllerleile) * child_process: fix sending utf-8 to child process (Ben Noordhuis) * crypto: check key type in GetPeerCertificate() (Ben Noordhuis) * win/openssl: mark assembled object files as seh safe (Bert Belder) * windows/msi: fix msi build issue with WiX 3.7/3.8 (Raymond Feng)
npm: Upgrade to v1.2.18
2026-04-28 03:01:10 -04:00 · 2013-04-08 16:51:44 -07:00 · 2013-04-08 16:47:58 -07:00 · 2013-04-08 16:25:50 -07:00 · 2013-04-07 19:04:02 +04:00 · 2013-03-25 13:33:26 +01:00
6784 changed files with 514088 additions and 792385 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 core
 vgcore.*
-v8*.log
-perf.data
-perf.data.old
 .waf*
 tags
 .lock-wscript
@@ -15,7 +12,6 @@ node_g
 .benchmark_reports
 /.project
 /.cproject
-icu_config.gypi

 /out

@@ -28,7 +24,6 @@ Release/
 *.suo
 *.vcproj
 *.vcxproj
-!custom_actions.vcxproj
 *.vcxproj.user
 *.vcxproj.filters
 UpgradeLog*.XML
@@ -47,18 +42,4 @@ ipch/
 email.md
 deps/v8-*
 ./node_modules
-.svn/
-
-# generated by gyp on Windows
-deps/openssl/openssl.props
-deps/openssl/openssl.targets
-deps/openssl/openssl.xml
-
-# build/release artifacts
-/*.tar.gz
-/SHASUMS*.txt*
-
-/tools/wrk/wrk
-
-# test artifacts
-tools/faketime
+.svn/
--- a/.mailmap
+++ b/.mailmap
@@ -8,9 +8,7 @@ Arlo Breault <arlolra@gmail.com>
 Artem Zaytsev <a.arepo@gmail.com>
 Atsuo Fukaya <fukayatsu@gmail.com>
 Ben Noordhuis <info@bnoordhuis.nl> <bnoordhuis@bender.(none)>
-Ben Taber <ben.taber@gmail.com>
 Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
-Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
 Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
 Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
 Brian White <mscdex@mscdex.net>
@@ -22,7 +20,6 @@ Daniel Chcouri <333222@gmail.com>
 Daniel Gröber <darklord@darkboxed.org>
 Daniel Gröber <darklord@darkboxed.org> <dxld@darkboxed.org>
 Daniel Pihlström <sciolist.se@gmail.com>
-Dave Pacheco <dap@joyent.com> <dap@cs.brown.edu>
 David Siegel <david@artcom.de> <david.siegel@artcom.de>
 Domenic Denicola <domenic@domenicdenicola.com>
 Eduard Burtescu <eddy_me08@yahoo.com>
@@ -31,37 +28,27 @@ Elliott Cable <me@ell.io>
 EungJun Yi <semtlenori@gmail.com>
 Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
-Felix Böhm <felixboehm55@googlemail.com> <me@feedic.com>
 Felix Geisendörfer <felix@debuggable.com>
 Felix Geisendörfer <felix@debuggable.com>
 Friedemann Altrock <frodenius@gmail.com>
 Fuji Goro <gfuji@cpan.org>
 Gabriel de Perthuis <g2p.code@gmail.com>
-Gil Pedersen <git@gpost.dk> <github@gpost.dk>
-Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
-Igor Soarez <igorsoarez@gmail.com>
 Igor Zinkovsky <igorzi@microsoft.com>
 Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
-Jake Verbaten <raynos2@gmail.com>
+Jérémy Lal <kapouer@melix.org>
+Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
 Jered Schmidt <tr@nslator.jp>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
 Jonas Pfenniger <jonas@pfenniger.name> <jonas@stvs.ch>
 Jonathan Rentzsch <jwr.git@redshed.net>
-Josh Erickson <josh@snoj.us>
 Joshua S. Weinstein <josher19@users.sf.net>
-Jérémy Lal <kapouer@melix.org>
-Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
-Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
-Kazuyuki Yamada <tasogare.pg@gmail.com>
 Koichi Kobayashi <koichik@improvement.jp>
 Kris Kowal <kris.kowal@cixar.com>
 Kyle Robinson Young <kyle@dontkry.com>
-Luke Bayes <lbayes@patternpark.com>
-Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
 Mathias Pettersson <mape@mape.me>
 Michael Bernstein <michaelrbernstein@gmail.com>
 Michael Wilber <gcr@sneakygcr.net>
@@ -80,7 +67,6 @@ Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
 Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
 Sambasiva Suda <sambasivarao@gmail.com>
 San-Tai Hsu <v@fatpipi.com>
-Scott Blomquist <github@scott.blomqui.st> <sblom@microsoft.com>
 Sergey Kryzhanovsky <skryzhanovsky@gmail.com> <another@dhcp199-223-red.yandex.net>
 Shannen Saez <shannenlaptop@gmail.com>
 Shigeki Ohtsu <ohtsu@d.jp> <ohtsu@iij.ad.jp>
@@ -88,22 +74,18 @@ Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
 Simon Willison <simon@simonwillison.net>
 Stanislav Opichal <opichals@gmail.com>
 Stefan Bühler <stbuehler@web.de>
-TJ Holowaychuk <tj@vision-media.ca>
-TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
 Tadashi SAWADA <cesare@mayverse.jp>
 Takahiro ANDO <takahiro.ando@gmail.com>
 Ted Young <ted@radicaldesigns.org>
 Thomas Lee <thomas.lee@shinetech.com> <tom@tom-debian.sensis.com.au>
 Tim Caswell <tim@creationix.com> <tim@0-26-8-e9-4c-e1.dyn.utdallas.edu>
-Tim Price <timprice@mangoraft.com>
 Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
 Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.com>
-Tom Hughes-Croucher <tom.hughes@palm.com>
-Tom Hughes-Croucher <tom.hughes@palm.com> <tom_croucher@yahoo.com>
+TJ Holowaychuk <tj@vision-media.ca>
+TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
 Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
 Vincent Voyer <v@fasterize.com>
-Willi Eggeling <email@wje-online.de>
 Yoshihiro KIKUCHI <yknetg@gmail.com>
 Yuichiro MASUI <masui@masuidrive.jp>
 Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
--- a/163
+++ b/163
@@ -124,7 +124,7 @@ Sam Stephenson <sam@37signals.com>
 Jorge Chamorro Bieling <jorge@jorgechamorro.com>
 Evan Larkin <evan.larkin.il.com>
 Sean Coates <sean@seancoates.com>
-Tom Hughes-Croucher <tom.hughes@palm.com>
+Tom Hughes <tom.hughes@palm.com>
 Joshua Peek <josh@joshpeek.com>
 Nathan Rajlich <nathan@tootallnate.net>
 Peteris Krumins <peteris.krumins@gmail.com>
@@ -223,8 +223,8 @@ Evan Martin <martine@danga.com>
 Peter Lyons <pete@peterlyons.com>
 Jann Horn <jannhorn@googlemail.com>
 Abimanyu Raja <abimanyuraja@gmail.com>
-Niclas Hoyer <niclas@verbugt.de>
 Karl Skomski <karl@skomski.com>
+Niclas Hoyer <niclas@verbugt.de>
 Michael Jackson <mjijackson@gmail.com>
 Ashok Mudukutore <ashok@lineratesystems.com>
 Sean Cunningham <sean.cunningham@mandiant.com>
@@ -325,6 +325,7 @@ Garen Torikian <gjtorikian@gmail.com>
 EungJun Yi <semtlenori@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Takahiro ANDO <takahiro.ando@gmail.com>
+Erwin van der Koogh <github@koogh.com>
 Brian Schroeder <bts@gmail.com>
 J. Lee Coltrane <lee@projectmastermind.com>
 Javier Hernández <jhernandez@emergya.com>
@@ -332,7 +333,6 @@ James Koval <james.ross.koval@gmail.com>
 Kevin Gadd <kevin.gadd@gmail.com>
 Ray Solomon <raybsolomon@gmail.com>
 Kevin Bowman <github@magicmonkey.org>
-Erwin van der Koogh <github@koogh.com>
 Matt Gollob <mattgollob@gmail.com>
 Simon Sturmer <sstur@me.com>
 Joel Brandt <joelrbrandt@gmail.com>
@@ -340,198 +340,47 @@ Marc Harter <wavded@gmail.com>
 Nuno Job <nunojobpinto@gmail.com>
 Ben Kelly <ben@wanderview.com>
 Felix Böhm <felixboehm55@googlemail.com>
-George Shank <shankga@gmail.com>
 Gabriel de Perthuis <g2p.code@gmail.com>
-Vladimir Beloborodov <redhead.ru@gmail.com>
 Tim Macfarlane <timmacfarlane@gmail.com>
 Jonas Westerlund <jonas.westerlund@me.com>
 Dominic Tarr <dominic.tarr@gmail.com>
 Justin Plock <jplock@gmail.com>
-Timothy J Fontaine <tjfontaine@gmail.com>
 Toshihiro Nakamura <toshihiro.nakamura@gmail.com>
 Ivan Torres <mexpolk@gmail.com>
 Philipp Hagemeister <phihag@phihag.de>
+George Shank <shankga@gmail.com>
 Mike Morearty <mike@morearty.com>
-Pavel Lang <langpavel@phpskelet.org>
 Peter Rybin <peter.rybin@gmail.com>
-Joe Andaverde <joe@andaverde.net>
 Eugen Dueck <eugen@dueck.org>
 Gil Pedersen <git@gpost.dk>
 Tyler Neylon <tylerneylon@gmail.com>
-Josh Erickson <josh@snoj.us>
 Golo Roden <webmaster@goloroden.de>
 Ron Korving <rkorving@wizcorp.jp>
 Brandon Wilson <chlavois@gmail.com>
-Ian Babrou <ibobrik@gmail.com>
 Bearice Ren <bearice@gmail.com>
 Ankur Oberoi <aoberoi@gmail.com>
 Atsuya Takagi <atsuya.takagi@gmail.com>
 Pooya Karimian <pkarimian@sencha.com>
 Frédéric Germain <frederic.germain@gmail.com>
 Robin Lee <cheeselee@fedoraproject.org>
-Kazuyuki Yamada <tasogare.pg@gmail.com>
 Adam Blackburn <regality@gmail.com>
 Willi Eggeling <email@wje-online.de>
-Paul Serby <paul.serby@clock.co.uk>
 Andrew Paprocki <andrew@ishiboo.com>
-Ricky Ng-Adam <rngadam@lophilo.com>
-Aaditya Bhatia <aadityabhatia@gmail.com>
 Max Ogden <max@maxogden.com>
-Igor Soarez <igorsoarez@gmail.com>
 Olivier Lalonde <olalonde@gmail.com>
 Francois Marier <francois@mozilla.com>
 Trevor Norris <trev.norris@gmail.com>
+Joshua Erickson <josh@snoj.us>
 Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
 Nicolas Chambrier <naholyr@gmail.com>
 Tim Bradshaw <tfb@cley.com>
 Johannes Ewald <mail@johannesewald.de>
 Chris Dent <chris.dent@gmail.com>
 Dan Milon <danmilon@gmail.com>
-Brandon Philips <brandon.philips@rackspace.com>
-Frederico Silva <frederico.silva@gmail.com>
-Jan Wynholds <jan@rootmusic.com>
-Girish Ramakrishnan <girish@forwardbias.in>
-Anthony Pesch <anthony@usamp.com>
-Stephen Gallagher <sgallagh@redhat.com>
-Sergey Kholodilov <serghol@gmail.com>
-Tim Kuijsten <tim@netsend.nl>
-Michael Axiak <mike@axiak.net>
-Chad Rhyner <chadrhyner@gmail.com>
-Ben Taber <ben.taber@gmail.com>
-Luke Arduini <luke.arduini@me.com>
-Luke Bayes <lbayes@patternpark.com>
-Nirk Niggler <nirk.niggler@gmail.com>
-James Hight <james@zavoo.com>
-Mike Harsch <mike@harschsystems.com>
-Alexandr Emelin <frvzmb@gmail.com>
-James Campos <james.r.campos@gmail.com>
-Dave Olszewski <cxreg@pobox.com>
-Tim Price <timprice@mangoraft.com>
-Jake Verbaten <raynos2@gmail.com>
 Jacob Gable <jacob.gable@gmail.com>
 Rick Yakubowski <richard@orpha-systems.com>
 Dan Kohn <dan@dankohn.com>
-Andy Burke <aburke@bitflood.org>
-Sugendran Ganess <sugendran@sugendran.net>
-Jim Schubert <james.schubert@gmail.com>
-Victor Costan <costan@gmail.com>
-Arianit Uka <arianit@bigvikinggames.com>
-Andrei Sedoi <bsnote@gmail.com>
+Timothy J Fontaine <tjfontaine@gmail.com>
 Eugene Girshov <eugene.girshov@nixu.com>
-Evan Oxfeld <eoxfeld@nearinfinity.com>
-Lars-Magnus Skog <lars.magnus.skog@gmail.com>
 Raymond Feng <enjoyjava@gmail.com>
-Aaron Cannon <cannona@fireantproductions.com>
-Xidorn Quan <quanxunzhen@gmail.com>
-Paolo Fragomeni <paolo@async.ly>
-Scott Blomquist <github@scott.blomqui.st>
-Henry Chin <hheennrryy@gmail.com>
-Julian Gruber <julian@juliangruber.com>
-JeongHoon Byun <outsideris@gmail.com>
-Iskren Ivov Chernev <iskren.chernev@gmail.com>
-Alexey Kupershtokh <alexey.kupershtokh@gmail.com>
-Benjamin Ruston <benjy.ruston@gmail.com>
-Mitar Milutinovic <mitar.git@tnode.com>
-Michael Hart <michael.hart.au@gmail.com>
-Andrew Hart <hartandrewr@gmail.com>
-Rafael Garcia <rgarcia2009@gmail.com>
 Tobias Müllerleile <tobias@muellerleile.net>
-Stanislav Ochotnicky <sochotnicky@redhat.com>
-Ryan Graham <r.m.graham@gmail.com>
-Kelly Gerber <kellygerber22@yahoo.com>
-Ryan Doenges <rhdoenges@gmail.com>
-Sean Silva <chisophugis@gmail.com>
-Miroslav Bajtoš <miro.bajtos@gmail.com>
-Sam Roberts <vieuxtech@gmail.com>
-Kevin Locke <kevin@kevinlocke.name>
-Daniel Moore <polaris@northhorizon.net>
-Robert Kowalski <rok@kowalski.gd>
-Benoit Vallée <github@benoitvallee.net>
-Ryuichi Okumura <okuryu@okuryu.com>
-Brandon Frohs <bfrohs@gmail.com>
-Nathan Zadoks <nathan@nathan7.eu>
-Rafael Henrique Moreira <rafadev7@gmail.com>
-Daniel G. Taylor <dan@programmer-art.org>
-Kiyoshi Nomo <tokyoincidents.g@gmail.com>
-Veres Lajos <vlajos@gmail.com>
-Yuan Chuan <yuanchuan23@gmail.com>
-Peter Rust <peter@cornerstonenw.com>
-Shuan Wang <shuanwang@gmail.com>
-Andrew Chilton <andychilton@gmail.com>
-Wyatt Preul <wpreul@gmail.com>
-Forrest L Norvell <ogd@aoaioxxysz.net>
-Eran Hammer <eran@hueniverse.com>
-Daniel Chatfield <chatfielddaniel@gmail.com>
-Eivind Uggedal <eivind@uggedal.com>
-Edward Hutchins <eahutchins@gmail.com>
-Chris Wren <cthewren@gmail.com>
-Duan Yao <duanyao@ustc.edu>
-Eric Schrock <Eric.Schrock@delphix.com>
-Zarko Stankovic <stankovic.zarko@gmail.com>
-Maxim Bogushevich <boga1@mail.ru>
-Phillip Alexander <git@phillipalexander.io>
-Tim Wood <washwithcare@gmail.com>
-Linus Unnebäck <linus@folkdatorn.se>
-Nikolai Vavilov <vvnicholas@gmail.com>
-Michael Ridgway <mcridgway@gmail.com>
-Yazhong Liu <yorkiefixer@gmail.com>
-Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
-Kai Groner <kai@gronr.com>
-Gabriel Farrell <g@grrawr.com>
-Nicolas Kaiser <nikai@nikai.net>
-Lev Gimelfarb <lev.gimelfarb@gmail.com>
-Dav Glass <davglass@gmail.com>
-ayanamist <contact@ayanamist.com>
-Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
-Brandon Cheng <bcheng.gt@gmail.com>
-Alexis Campailla <alexis@janeasystems.com>
-Jun Ma <roammm@gmail.com>
-Maxime Quandalle <maxime.quandalle@gmail.com>
-Benjamin Waters <ben25890@gmail.com>
-Doron Pagot <doronpagot@gmail.com>
-Kenan Sulayman <kenan@sly.mn>
-Christian Schulz <me@rndm.de>
-Pedro Ballesteros <nitroduna@gmail.com>
-Anton Khlynovskiy <subzey@gmail.com>
-Nicolas Talle <dev@nicolab.net>
-Mike Pennisi <mike@mikepennisi.com>
-Greg Brail <greg@apigee.com>
-Shuhei Kagawa <shuhei.kagawa@gmail.com>
-Josh Dague <daguej@email.uc.edu>
-Goh Yisheng (Andrew) <mail.yisheng@gmail.com>
-William Bert <william@spanishdict.com>
-Greg Sabia Tucker <greg@narrowlabs.com>
-Calvin Metcalf <calvin.metcalf@gmail.com>
-cjihrig <cjihrig@gmail.com>
-Chris Barber <chris@cb1inc.com>
-Nick Apperson <apperson@gmail.com>
-Oguz Bastemur <obastemur@gmail.com>
-Maurice Butler <maurice.butler@gmail.com>
-Chris Dickinson <christopher.s.dickinson@gmail.com>
-Julien Gilli <julien.gilli@joyent.com>
-Jakob Gillich <jakob@gillich.me>
-James Halliday <mail@substack.net>
-Kevin Simper <kevin.simper@gmail.com>
-Jackson Tian <shyvo1987@gmail.com>
-Tristan Berger <tristan.berger@gmail.com>
-Mathias Schreck <schreck.mathias@googlemail.com>
-Matthew Fitzsimmons <matt@fitzage.com>
-Swaagie <info@martijnswaagman.nl>
-Emmanuel Odeke <emmanuel.odeke@cmgcanada.ca>
-Eric Mill <eric@konklone.com>
-Brendan Ashworth <squirrelslikeacorns@gmail.com>
-Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
-pkcs <pkcs@gmx.com>
-Saúl Ibarra Corretgé <saghul@gmail.com>
-silverwind <silv3rwind@gmail.com>
-Steven R. Loomis <srl@icu-project.org>
-James M Snell <jasnell@gmail.com>
-Amir Saboury <amir.saboury@gmail.com>
-Florin-Cristian Gavrila <cristi_gavrila1@yahoo.com>
-Tyler Anton <mtyleranton@gmail.com>
-Jonas Dohse <jonas@dohse.ch>
-Paulo McNally <paulomcnally@gmail.com>
-AlexKVal <alexkval@gmail.com>
-João Reis <reis@janeasystems.com>
-Mathias Küsel <mathiask@hotmail.de>
-Steven Rockarts <srockarts@invidi.com>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,10 +49,10 @@ Okay, so you have decided on the proper branch.  Create a feature branch
 and start hacking:

 ```
-$ git checkout -b my-feature-branch -t origin/v0.10
+$ git checkout -b my-feature-branch -t origin/v0.8
 ```

-(Where v0.10 is the latest stable branch as of this writing.)
+(Where v0.8 is the latest stable branch as of this writing.)


 ### COMMIT
@@ -68,15 +68,14 @@ Writing good commit logs is important.  A commit log should describe what
 changed and why.  Follow these guidelines when writing one:

 1. The first line should be 50 characters or less and contain a short
-   description of the change prefixed with the name of the changed
-   subsystem (e.g. "net: add localAddress and localPort to Socket").
+   description of the change.
 2. Keep the second line blank.
 3. Wrap all other lines at 72 columns.

 A good commit log looks like this:

 ```
-subsystem: explaining the commit in one line
+Header line: explaining the commit in one line

 Body of commit message is a few lines of text, explaining things
 in more detail, possibly giving some background about the issue
@@ -91,8 +90,7 @@ nicely even when it is indented.
 The header line should be meaningful; it is what other people see when they
 run `git shortlog` or `git log --oneline`.

-Check the output of `git log --oneline files_that_you_changed` to find out
-what subsystem (or subsystems) your changes touch.
+Have a look at `git log` for inspiration.


 ### REBASE
@@ -101,7 +99,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.

 ```
 $ git fetch upstream
-$ git rebase upstream/v0.10  # or upstream/master
+$ git rebase upstream/v0.8  # or upstream/master
 ```


@@ -134,6 +132,12 @@ feature branch.  Post a comment in the pull request afterwards; GitHub does
 not send out notifications when you add commits.


+### CONTRIBUTOR LICENSE AGREEMENT
+
+Please visit http://nodejs.org/cla.html and sign the Contributor License
+Agreement.  You only need to do that once.
+
+
 [stability index page]: https://github.com/joyent/node/blob/master/doc/api/documentation.markdown
 [issue tracker]: https://github.com/joyent/node/issues
 [node.js mailing list]: http://groups.google.com/group/nodejs
--- a/1259
+++ b/1259
--- a/600
+++ b/600
@@ -84,7 +84,118 @@ maintained libraries. The externally maintained libraries used by Node are:
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  """

- C-Ares, an asynchronous DNS client, located at deps/cares. C-Ares license
+- libev, located at deps/uv/src/unix/ev. libev's license follows:
+  """
+    All files in libev are Copyright (C)2007,2008,2009 Marc Alexander Lehmann.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided
+          with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    Alternatively, the contents of this package may be used under the terms
+    of the GNU General Public License ("GPL") version 2 or any later version,
+    in which case the provisions of the GPL are applicable instead of the
+    above. If you wish to allow the use of your version of this package only
+    under the terms of the GPL and not to allow others to use your version of
+    this file under the BSD license, indicate your decision by deleting the
+    provisions above and replace them with the notice and other provisions
+    required by the GPL in this and the other files of this package. If you do
+    not delete the provisions above, a recipient may use your version of this
+    file under either the BSD or the GPL.
+  """
+
+- libeio, located at deps/uv/src/unix/eio. libeio's license follows:
+  """
+    All files in libeio are Copyright (C)2007,2008 Marc Alexander Lehmann.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+
+        * Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided
+          with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    Alternatively, the contents of this package may be used under the terms
+    of the GNU General Public License ("GPL") version 2 or any later version,
+    in which case the provisions of the GPL are applicable instead of the
+    above. If you wish to allow the use of your version of this package only
+    under the terms of the GPL and not to allow others to use your version of
+    this file under the BSD license, indicate your decision by deleting the
+    provisions above and replace them with the notice and other provisions
+    required by the GPL in this and the other files of this package. If you do
+    not delete the provisions above, a recipient may use your version of this
+    file under either the BSD or the GPL.
+  """
+
+- WAF build system, located at tools/waf*. WAF's license follows:
+  """
+    Copyright Thomas Nagy, 2005-2011
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+    IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+  """
+
+- C-Ares, an asynchronous DNS client, located at deps/uv/src/ares. C-Ares license
  follows:
  """
    /* Copyright 1998 by the Massachusetts Institute of Technology.
@@ -252,6 +363,38 @@ maintained libraries. The externally maintained libraries used by Node are:
    # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  """

+- lib/buffer_ieee754.js. Its license follows:
+  """
+    // Copyright (c) 2008, Fair Oaks Labs, Inc.
+    // All rights reserved.
+    //
+    // Redistribution and use in source and binary forms, with or without
+    // modification, are permitted provided that the following conditions are met:
+    //
+    //  * Redistributions of source code must retain the above copyright notice,
+    //    this list of conditions and the following disclaimer.
+    //
+    //  * Redistributions in binary form must reproduce the above copyright notice,
+    //    this list of conditions and the following disclaimer in the documentation
+    //    and/or other materials provided with the distribution.
+    //
+    //  * Neither the name of Fair Oaks Labs, Inc. nor the names of its contributors
+    //    may be used to endorse or promote products derived from this software
+    //    without specific prior written permission.
+    //
+    // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    // ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+    // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    // POSSIBILITY OF SUCH DAMAGE.
+  """
+
 - lib/punycode.js is copyright 2011 Mathias Bynens <http://mathiasbynens.be/>
  and released under the MIT license.
  """
@@ -294,9 +437,9 @@ maintained libraries. The externally maintained libraries used by Node are:
 - Zlib at deps/zlib. zlib's license follows:
  """
    /* zlib.h -- interface of the 'zlib' general purpose compression library
-      version 1.2.8, April 28th, 2013
+      version 1.2.4, March 14th, 2010

-      Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+      Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler

      This software is provided 'as-is', without any express or implied
      warranty.  In no event will the authors be held liable for any damages
@@ -314,249 +457,79 @@ maintained libraries. The externally maintained libraries used by Node are:
         misrepresented as being the original software.
      3. This notice may not be removed or altered from any source distribution.

-      Jean-loup Gailly        Mark Adler
-      jloup@gzip.org          madler@alumni.caltech.edu
+      Jean-loup Gailly
+      Mark Adler
+
    */
  """

 - npm is a package manager program located at deps/npm.
  npm's license follows:
  """
-    Copyright (c) Isaac Z. Schlueter
+    Copyright 2009-2012, Isaac Z. Schlueter (the "Original Author")
    All rights reserved.

-    npm is released under the Artistic 2.0 License.
-    The text of the License follows:
+    MIT +no-false-attribs License
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    Distributions of all or part of the Software intended to be used
+    by the recipients as they would use the unmodified Software,
+    containing modifications that substantially alter, remove, or
+    disable functionality of the Software, outside of the documented
+    configuration mechanisms provided by the Software, shall be
+    modified such that the Original Author's bug reporting email
+    addresses and urls are either replaced with the contact information
+    of the parties responsible for the changes, or removed entirely.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS IN THE SOFTWARE.


-    --------
-
-
-    The Artistic License 2.0
-
-    Copyright (c) 2000-2006, The Perl Foundation.
-
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-    Preamble
-
-    This license establishes the terms under which a given free software
-    Package may be copied, modified, distributed, and/or redistributed.
-    The intent is that the Copyright Holder maintains some artistic
-    control over the development of that Package while still keeping the
-    Package available as open source and free software.
-
-    You are always permitted to make arrangements wholly outside of this
-    license directly with the Copyright Holder of a given Package.  If the
-    terms of this license do not permit the full use that you propose to
-    make of the Package, you should contact the Copyright Holder and seek
-    a different licensing arrangement.
-
-    Definitions
-
-        "Copyright Holder" means the individual(s) or organization(s)
-        named in the copyright notice for the entire Package.
-
-        "Contributor" means any party that has contributed code or other
-        material to the Package, in accordance with the Copyright Holder's
-        procedures.
-
-        "You" and "your" means any person who would like to copy,
-        distribute, or modify the Package.
-
-        "Package" means the collection of files distributed by the
-        Copyright Holder, and derivatives of that collection and/or of
-        those files. A given Package may consist of either the Standard
-        Version, or a Modified Version.
-
-        "Distribute" means providing a copy of the Package or making it
-        accessible to anyone else, or in the case of a company or
-        organization, to others outside of your company or organization.
-
-        "Distributor Fee" means any fee that you charge for Distributing
-        this Package or providing support for this Package to another
-        party.  It does not mean licensing fees.
-
-        "Standard Version" refers to the Package if it has not been
-        modified, or has been modified only in ways explicitly requested
-        by the Copyright Holder.
-
-        "Modified Version" means the Package, if it has been changed, and
-        such changes were not explicitly requested by the Copyright
-        Holder.
-
-        "Original License" means this Artistic License as Distributed with
-        the Standard Version of the Package, in its current version or as
-        it may be modified by The Perl Foundation in the future.
-
-        "Source" form means the source code, documentation source, and
-        configuration files for the Package.
-
-        "Compiled" form means the compiled bytecode, object code, binary,
-        or any other form resulting from mechanical transformation or
-        translation of the Source form.
-
-
-    Permission for Use and Modification Without Distribution
-
-    (1)  You are permitted to use the Standard Version and create and use
-    Modified Versions for any purpose without restriction, provided that
-    you do not Distribute the Modified Version.
-
-
-    Permissions for Redistribution of the Standard Version
-
-    (2)  You may Distribute verbatim copies of the Source form of the
-    Standard Version of this Package in any medium without restriction,
-    either gratis or for a Distributor Fee, provided that you duplicate
-    all of the original copyright notices and associated disclaimers.  At
-    your discretion, such verbatim copies may or may not include a
-    Compiled form of the Package.
-
-    (3)  You may apply any bug fixes, portability changes, and other
-    modifications made available from the Copyright Holder.  The resulting
-    Package will still be considered the Standard Version, and as such
-    will be subject to the Original License.
-
-
-    Distribution of Modified Versions of the Package as Source
-
-    (4)  You may Distribute your Modified Version as Source (either gratis
-    or for a Distributor Fee, and with or without a Compiled form of the
-    Modified Version) provided that you clearly document how it differs
-    from the Standard Version, including, but not limited to, documenting
-    any non-standard features, executables, or modules, and provided that
-    you do at least ONE of the following:
-
-        (a)  make the Modified Version available to the Copyright Holder
-        of the Standard Version, under the Original License, so that the
-        Copyright Holder may include your modifications in the Standard
-        Version.
-
-        (b)  ensure that installation of your Modified Version does not
-        prevent the user installing or running the Standard Version. In
-        addition, the Modified Version must bear a name that is different
-        from the name of the Standard Version.
-
-        (c)  allow anyone who receives a copy of the Modified Version to
-        make the Source form of the Modified Version available to others
-        under
-
-            (i)  the Original License or
-
-            (ii)  a license that permits the licensee to freely copy,
-            modify and redistribute the Modified Version using the same
-            licensing terms that apply to the copy that the licensee
-            received, and requires that the Source form of the Modified
-            Version, and of any works derived from it, be made freely
-            available in that license fees are prohibited but Distributor
-            Fees are allowed.
-
-
-    Distribution of Compiled Forms of the Standard Version
-    or Modified Versions without the Source
-
-    (5)  You may Distribute Compiled forms of the Standard Version without
-    the Source, provided that you include complete instructions on how to
-    get the Source of the Standard Version.  Such instructions must be
-    valid at the time of your distribution.  If these instructions, at any
-    time while you are carrying out such distribution, become invalid, you
-    must provide new instructions on demand or cease further distribution.
-    If you provide valid instructions or cease distribution within thirty
-    days after you become aware that the instructions are invalid, then
-    you do not forfeit any of your rights under this license.
-
-    (6)  You may Distribute a Modified Version in Compiled form without
-    the Source, provided that you comply with Section 4 with respect to
-    the Source of the Modified Version.
-
-
-    Aggregating or Linking the Package
-
-    (7)  You may aggregate the Package (either the Standard Version or
-    Modified Version) with other packages and Distribute the resulting
-    aggregation provided that you do not charge a licensing fee for the
-    Package.  Distributor Fees are permitted, and licensing fees for other
-    components in the aggregation are permitted. The terms of this license
-    apply to the use and Distribution of the Standard or Modified Versions
-    as included in the aggregation.
-
-    (8) You are permitted to link Modified and Standard Versions with
-    other works, to embed the Package in a larger work of your own, or to
-    build stand-alone binary or bytecode versions of applications that
-    include the Package, and Distribute the result without restriction,
-    provided the result does not expose a direct interface to the Package.
-
-
-    Items That are Not Considered Part of a Modified Version
-
-    (9) Works (including, but not limited to, modules and scripts) that
-    merely extend or make use of the Package, do not, by themselves, cause
-    the Package to be a Modified Version.  In addition, such works are not
-    considered parts of the Package itself, and are not subject to the
-    terms of this license.
-
-
-    General Provisions
-
-    (10)  Any use, modification, and distribution of the Standard or
-    Modified Versions is governed by this Artistic License. By using,
-    modifying or distributing the Package, you accept this license. Do not
-    use, modify, or distribute the Package, if you do not accept this
-    license.
-
-    (11)  If your Modified Version has been derived from a Modified
-    Version made by someone other than you, you are nevertheless required
-    to ensure that your Modified Version complies with the requirements of
-    this license.
-
-    (12)  This license does not grant you the right to use any trademark,
-    service mark, tradename, or logo of the Copyright Holder.
-
-    (13)  This license includes the non-exclusive, worldwide,
-    free-of-charge patent license to make, have made, use, offer to sell,
-    sell, import and otherwise transfer the Package with respect to any
-    patent claims licensable by the Copyright Holder that are necessarily
-    infringed by the Package. If you institute patent litigation
-    (including a cross-claim or counterclaim) against any party alleging
-    that the Package constitutes direct or contributory patent
-    infringement, then this Artistic License to you shall terminate on the
-    date that such litigation is filed.
-
-    (14)  Disclaimer of Warranty:
-    THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
-    IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-    NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL
-    LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-    DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-    --------
-
+    Except where noted, this license applies to any and all software
+    programs and associated documentation files created by the
+    Original Author, when distributed with the Software.

    "Node.js" and "node" trademark Joyent, Inc. npm is not officially
    part of the Node.js project, and is neither owned by nor
    officially affiliated with Joyent, Inc.

-    Packages published in the npm registry (other than the Software and
-    its included dependencies) are not part of npm itself, are the sole
-    property of their respective maintainers, and are not covered by
-    this license.
+    Packages published in the npm registry are not part of npm
+    itself, are the sole property of their respective maintainers,
+    and are not covered by this license.

    "npm Logo" created by Mathias Pettersson and Brian Hammond,
    used with permission.

    "Gubblebum Blocky" font
-    Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com
+    Copyright (c) 2007 by Tjarda Koster, http://jelloween.deviantart.com
    included for use in the npm website and documentation,
    used with permission.

-    This program uses several Node modules contained in the node_modules/
-    subdirectory, according to the terms of their respective licenses.
+    This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer,
+    according to the terms of the MIT license.
+
+    This program uses "request", Copyright (c) 2011 Mikeal Rogers,
+    according to the terms of the Apache license.
+
+    This program uses "mkdirp",  Copyright (c) 2010 James Halliday,
+    according to the terms of the MIT/X11 license.
  """

 - tools/doc/node_modules/marked. Marked is a Markdown parser. Marked's
@@ -628,184 +601,3 @@ maintained libraries. The externally maintained libraries used by Node are:
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    SUCH DAMAGE.
  """
-
- wrk is located at tools/wrk. wrk's license follows:
-  """
-
-                                     Apache License
-                               Version 2.0, January 2004
-                            http://www.apache.org/licenses/
-
-       TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-       1. Definitions.
-
-          "License" shall mean the terms and conditions for use, reproduction,
-          and distribution as defined by Sections 1 through 9 of this document.
-
-          "Licensor" shall mean the copyright owner or entity authorized by
-          the copyright owner that is granting the License.
-
-          "Legal Entity" shall mean the union of the acting entity and all
-          other entities that control, are controlled by, or are under common
-          control with that entity. For the purposes of this definition,
-          "control" means (i) the power, direct or indirect, to cause the
-          direction or management of such entity, whether by contract or
-          otherwise, or (ii) ownership of fifty percent (50%) or more of the
-          outstanding shares, or (iii) beneficial ownership of such entity.
-
-          "You" (or "Your") shall mean an individual or Legal Entity
-          exercising permissions granted by this License.
-
-          "Source" form shall mean the preferred form for making modifications,
-          including but not limited to software source code, documentation
-          source, and configuration files.
-
-          "Object" form shall mean any form resulting from mechanical
-          transformation or translation of a Source form, including but
-          not limited to compiled object code, generated documentation,
-          and conversions to other media types.
-
-          "Work" shall mean the work of authorship, whether in Source or
-          Object form, made available under the License, as indicated by a
-          copyright notice that is included in or attached to the work
-          (an example is provided in the Appendix below).
-
-          "Derivative Works" shall mean any work, whether in Source or Object
-          form, that is based on (or derived from) the Work and for which the
-          editorial revisions, annotations, elaborations, or other modifications
-          represent, as a whole, an original work of authorship. For the purposes
-          of this License, Derivative Works shall not include works that remain
-          separable from, or merely link (or bind by name) to the interfaces of,
-          the Work and Derivative Works thereof.
-
-          "Contribution" shall mean any work of authorship, including
-          the original version of the Work and any modifications or additions
-          to that Work or Derivative Works thereof, that is intentionally
-          submitted to Licensor for inclusion in the Work by the copyright owner
-          or by an individual or Legal Entity authorized to submit on behalf of
-          the copyright owner. For the purposes of this definition, "submitted"
-          means any form of electronic, verbal, or written communication sent
-          to the Licensor or its representatives, including but not limited to
-          communication on electronic mailing lists, source code control systems,
-          and issue tracking systems that are managed by, or on behalf of, the
-          Licensor for the purpose of discussing and improving the Work, but
-          excluding communication that is conspicuously marked or otherwise
-          designated in writing by the copyright owner as "Not a Contribution."
-
-          "Contributor" shall mean Licensor and any individual or Legal Entity
-          on behalf of whom a Contribution has been received by Licensor and
-          subsequently incorporated within the Work.
-
-       2. Grant of Copyright License. Subject to the terms and conditions of
-          this License, each Contributor hereby grants to You a perpetual,
-          worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-          copyright license to reproduce, prepare Derivative Works of,
-          publicly display, publicly perform, sublicense, and distribute the
-          Work and such Derivative Works in Source or Object form.
-
-       3. Grant of Patent License. Subject to the terms and conditions of
-          this License, each Contributor hereby grants to You a perpetual,
-          worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-          (except as stated in this section) patent license to make, have made,
-          use, offer to sell, sell, import, and otherwise transfer the Work,
-          where such license applies only to those patent claims licensable
-          by such Contributor that are necessarily infringed by their
-          Contribution(s) alone or by combination of their Contribution(s)
-          with the Work to which such Contribution(s) was submitted. If You
-          institute patent litigation against any entity (including a
-          cross-claim or counterclaim in a lawsuit) alleging that the Work
-          or a Contribution incorporated within the Work constitutes direct
-          or contributory patent infringement, then any patent licenses
-          granted to You under this License for that Work shall terminate
-          as of the date such litigation is filed.
-
-       4. Redistribution. You may reproduce and distribute copies of the
-          Work or Derivative Works thereof in any medium, with or without
-          modifications, and in Source or Object form, provided that You
-          meet the following conditions:
-
-          (a) You must give any other recipients of the Work or
-              Derivative Works a copy of this License; and
-
-          (b) You must cause any modified files to carry prominent notices
-              stating that You changed the files; and
-
-          (c) You must retain, in the Source form of any Derivative Works
-              that You distribute, all copyright, patent, trademark, and
-              attribution notices from the Source form of the Work,
-              excluding those notices that do not pertain to any part of
-              the Derivative Works; and
-
-          (d) If the Work includes a "NOTICE" text file as part of its
-              distribution, then any Derivative Works that You distribute must
-              include a readable copy of the attribution notices contained
-              within such NOTICE file, excluding those notices that do not
-              pertain to any part of the Derivative Works, in at least one
-              of the following places: within a NOTICE text file distributed
-              as part of the Derivative Works; within the Source form or
-              documentation, if provided along with the Derivative Works; or,
-              within a display generated by the Derivative Works, if and
-              wherever such third-party notices normally appear. The contents
-              of the NOTICE file are for informational purposes only and
-              do not modify the License. You may add Your own attribution
-              notices within Derivative Works that You distribute, alongside
-              or as an addendum to the NOTICE text from the Work, provided
-              that such additional attribution notices cannot be construed
-              as modifying the License.
-
-          You may add Your own copyright statement to Your modifications and
-          may provide additional or different license terms and conditions
-          for use, reproduction, or distribution of Your modifications, or
-          for any such Derivative Works as a whole, provided Your use,
-          reproduction, and distribution of the Work otherwise complies with
-          the conditions stated in this License.
-
-       5. Submission of Contributions. Unless You explicitly state otherwise,
-          any Contribution intentionally submitted for inclusion in the Work
-          by You to the Licensor shall be under the terms and conditions of
-          this License, without any additional terms or conditions.
-          Notwithstanding the above, nothing herein shall supersede or modify
-          the terms of any separate license agreement you may have executed
-          with Licensor regarding such Contributions.
-
-       6. Trademarks. This License does not grant permission to use the trade
-          names, trademarks, service marks, or product names of the Licensor,
-          except as required for reasonable and customary use in describing the
-          origin of the Work and reproducing the content of the NOTICE file.
-
-       7. Disclaimer of Warranty. Unless required by applicable law or
-          agreed to in writing, Licensor provides the Work (and each
-          Contributor provides its Contributions) on an "AS IS" BASIS,
-          WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-          implied, including, without limitation, any warranties or conditions
-          of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-          PARTICULAR PURPOSE. You are solely responsible for determining the
-          appropriateness of using or redistributing the Work and assume any
-          risks associated with Your exercise of permissions under this License.
-
-       8. Limitation of Liability. In no event and under no legal theory,
-          whether in tort (including negligence), contract, or otherwise,
-          unless required by applicable law (such as deliberate and grossly
-          negligent acts) or agreed to in writing, shall any Contributor be
-          liable to You for damages, including any direct, indirect, special,
-          incidental, or consequential damages of any character arising as a
-          result of this License or out of the use or inability to use the
-          Work (including but not limited to damages for loss of goodwill,
-          work stoppage, computer failure or malfunction, or any and all
-          other commercial damages or losses), even if such Contributor
-          has been advised of the possibility of such damages.
-
-       9. Accepting Warranty or Additional Liability. While redistributing
-          the Work or Derivative Works thereof, You may choose to offer,
-          and charge a fee for, acceptance of support, warranty, indemnity,
-          or other liability obligations and/or rights consistent with this
-          License. However, in accepting such obligations, You may act only
-          on Your own behalf and on Your sole responsibility, not on behalf
-          of any other Contributor, and only if You agree to indemnify,
-          defend, and hold each Contributor harmless for any liability
-          incurred by, or claims asserted against, such Contributor by reason
-          of your accepting any such warranty or additional liability.
-
-       END OF TERMS AND CONDITIONS
-  """
--- a/193
+++ b/193
@@ -2,12 +2,8 @@

 BUILDTYPE ?= Release
 PYTHON ?= python
-NINJA ?= ninja
 DESTDIR ?=
 SIGN ?=
-FLAKY_TESTS ?= run
-
-NODE ?= ./node

 # Default to verbose builds.
 # To do quiet/pretty builds, run `make V=` to set V to an empty string,
@@ -26,34 +22,22 @@ endif
 # to check for changes.
 .PHONY: node node_g

-ifeq ($(USE_NINJA),1)
-node: config.gypi
-	$(NINJA) -C out/Release/
-	ln -fs out/Release/node node
-
-node_g: config.gypi
-	$(NINJA) -C out/Debug/
-	ln -fs out/Debug/node $@
-else
 node: config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Release V=$(V)
 	ln -fs out/Release/node node

 node_g: config.gypi out/Makefile
 	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
-	ln -fs out/Debug/node $@
-endif
-
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/common.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
-ifeq ($(USE_NINJA),1)
-	touch out/Makefile
-	$(PYTHON) tools/gyp_node.py -f ninja
-else
-	$(PYTHON) tools/gyp_node.py -f make
-endif
+	ln -fs out/Debug/node node_g

 config.gypi: configure
-	$(PYTHON) ./configure
+	./configure
+
+out/Debug/node:
+	$(MAKE) -C out BUILDTYPE=Debug V=$(V)
+
+out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp deps/v8/build/common.gypi deps/v8/tools/gyp/v8.gyp node.gyp config.gypi
+	$(PYTHON) tools/gyp_node -f make

 install: all
 	$(PYTHON) tools/install.py $@ $(DESTDIR)
@@ -75,7 +59,7 @@ distclean:

 test: all
 	$(PYTHON) tools/test.py --mode=release simple message
-	$(MAKE) jslint
+	PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js

 test-http1: all
 	$(PYTHON) tools/test.py --mode=release --use-http1 simple message
@@ -83,16 +67,16 @@ test-http1: all
 test-valgrind: all
 	$(PYTHON) tools/test.py --mode=release --valgrind simple message

-test/gc/node_modules/weak/build/Release/weakref.node:
+test/gc/node_modules/weak/build:
 	@if [ ! -f node ]; then make all; fi
 	./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
 		--directory="$(shell pwd)/test/gc/node_modules/weak" \
 		--nodedir="$(shell pwd)"

-test-gc: all test/gc/node_modules/weak/build/Release/weakref.node
+test-gc: all test/gc/node_modules/weak/build
 	$(PYTHON) tools/test.py --mode=release gc

-test-all: all test/gc/node_modules/weak/build/Release/weakref.node
+test-all: all test/gc/node_modules/weak/build
 	$(PYTHON) tools/test.py --mode=debug,release
 	make test-npm

@@ -102,9 +86,6 @@ test-all-http1: all
 test-all-valgrind: all
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind

-test-ci:
-	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) --flaky-tests=$(FLAKY_TESTS) simple message internet
-
 test-release: all
 	$(PYTHON) tools/test.py --mode=release

@@ -129,29 +110,40 @@ test-npm: node
 test-npm-publish: node
 	npm_package_config_publishtest=true ./node deps/npm/test/run.js

-test-timers:
-	$(MAKE) --directory=tools faketime
-	$(PYTHON) tools/test.py --mode=release timers
-
-test-timers-clean:
-	$(MAKE) --directory=tools clean
-
 apidoc_sources = $(wildcard doc/api/*.markdown)
 apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) \
          $(addprefix out/,$(apidoc_sources:.markdown=.json))

-apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets
+apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/download out/doc/logos out/doc/images

 apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))

+doc_images = $(addprefix out/,$(wildcard doc/images/* doc/*.jpg doc/*.png))
+
 website_files = \
+	out/doc/index.html    \
+	out/doc/v0.4_announcement.html   \
+	out/doc/cla.html      \
 	out/doc/sh_main.js    \
-	out/doc/sh_javascript.min.js
+	out/doc/sh_javascript.min.js \
+	out/doc/sh_vim-dark.css \
+	out/doc/sh.css \
+	out/doc/favicon.ico   \
+	out/doc/pipe.css \
+	out/doc/about/index.html \
+	out/doc/community/index.html \
+	out/doc/download/index.html \
+	out/doc/logos/index.html \
+	out/doc/changelog.html \
+	$(doc_images)

-doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ out/doc/changelog.html node
+doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ blog node

-doc-branch: NODE_DOC_VERSION = v$(shell $(PYTHON) tools/getnodeversion.py | cut -f1,2 -d.)
-doc-branch: doc
+blogclean:
+	rm -rf out/blog
+
+blog: doc/blog out/Release/node tools/blog
+	out/Release/node tools/blog/generate.js doc/blog/ out/blog/ doc/blog.html doc/rss.xml

 $(apidoc_dirs):
 	mkdir -p $@
@@ -162,14 +154,17 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
 out/doc/changelog.html: ChangeLog doc/changelog-head.html doc/changelog-foot.html tools/build-changelog.sh node
 	bash tools/build-changelog.sh

+out/doc/%.html: doc/%.html node
+	cat $< | sed -e 's|__VERSION__|'$(VERSION)'|g' > $@
+
 out/doc/%: doc/%
 	cp -r $< $@

 out/doc/api/%.json: doc/api/%.markdown node
-	NODE_DOC_VERSION=$(NODE_DOC_VERSION) out/Release/node tools/doc/generate.js --format=json $< > $@
+	out/Release/node tools/doc/generate.js --format=json $< > $@

 out/doc/api/%.html: doc/api/%.markdown node
-	NODE_DOC_VERSION=$(NODE_DOC_VERSION) out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
+	out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@

 email.md: ChangeLog tools/email-footer.md
 	bash tools/changelog-head.sh | sed 's|^\* #|* \\#|g' > $@
@@ -178,6 +173,9 @@ email.md: ChangeLog tools/email-footer.md
 blog.html: email.md
 	cat $< | ./node tools/doc/node_modules/.bin/marked > $@

+blog-upload: blog
+	rsync -r out/blog/ node@nodejs.org:~/web/nodejs.org/blog/
+
 website-upload: doc
 	rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/
 	ssh node@nodejs.org '\
@@ -188,25 +186,13 @@ website-upload: doc
    rm -f ~/web/nodejs.org/dist/node-latest.tar.gz &&\
    ln -s $(VERSION)/node-$(VERSION).tar.gz ~/web/nodejs.org/dist/node-latest.tar.gz'

-doc-branch-upload: NODE_DOC_VERSION = v$(shell $(PYTHON) tools/getnodeversion.py | cut -f1,2 -d.)
-doc-branch-upload: doc-branch
-	echo $(NODE_DOC_VERSION)
-	rsync -r out/doc/api/ node@nodejs.org:~/web/nodejs.org/$(NODE_DOC_VERSION)
-
 docopen: out/doc/api/all.html
 	-google-chrome out/doc/api/all.html

 docclean:
 	-rm -rf out/doc

-run-ci:
-	$(PYTHON) ./configure --without-snapshot $(CONFIG_FLAGS)
-	$(MAKE)
-	$(MAKE) test-ci
-
-RAWVER=$(shell $(PYTHON) tools/getnodeversion.py)
-VERSION=v$(RAWVER)
-NODE_DOC_VERSION=$(VERSION)
+VERSION=v$(shell $(PYTHON) tools/getnodeversion.py)
 RELEASE=$(shell $(PYTHON) tools/getnodeisrelease.py)
 PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]')
 ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
@@ -217,27 +203,14 @@ endif
 ifeq ($(DESTCPU),x64)
 ARCH=x64
 else
-ifeq ($(DESTCPU),arm)
-ARCH=arm
-else
 ARCH=x86
 endif
-endif
 TARNAME=node-$(VERSION)
-ifdef NIGHTLY
-TAG = nightly-$(NIGHTLY)
-TARNAME=node-$(VERSION)-$(TAG)
-endif
 TARBALL=$(TARNAME).tar.gz
 BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
 BINARYTAR=$(BINARYNAME).tar.gz
 PKG=out/$(TARNAME).pkg
-PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
-
-PKGSRC=nodejs-$(DESTCPU)-$(RAWVER).tgz
-ifdef NIGHTLY
-PKGSRC=nodejs-$(DESTCPU)-$(RAWVER)-$(TAG).tgz
-endif
+packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker

 dist: doc $(TARBALL) $(PKG)

@@ -255,7 +228,7 @@ release-only:
 		echo "" >&2 ; \
 		exit 1 ; \
 	fi
-	@if [ "$(NIGHTLY)" != "" -o "$(RELEASE)" = "1" ]; then \
+	@if [ "$(RELEASE)" = "1" ]; then \
 		exit 0; \
 	else \
 	  echo "" >&2 ; \
@@ -270,23 +243,23 @@ pkg: $(PKG)
 $(PKG): release-only
 	rm -rf $(PKGDIR)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG)
-	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32
+	./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32
+	$(MAKE) install V=$(V)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
-	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
-	SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
+	./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64
+	$(MAKE) install V=$(V)
+	SIGN="$(SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
 	lipo $(PKGDIR)/32/usr/local/bin/node \
 		$(PKGDIR)/usr/local/bin/node \
 		-output $(PKGDIR)/usr/local/bin/node-universal \
 		-create
 	mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
 	rm -rf $(PKGDIR)/32
-	$(PACKAGEMAKER) \
+	$(packagemaker) \
 		--id "org.nodejs.Node" \
 		--doc tools/osx-pkg.pmdoc \
 		--out $(PKG)
-	SIGN="$(INT_SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh
+	SIGN="$(SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh

 $(TARBALL): release-only node doc
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
@@ -305,7 +278,7 @@ tar: $(TARBALL)
 $(BINARYTAR): release-only
 	rm -rf $(BINARYNAME)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
+	./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) $(CONFIG_FLAGS)
 	$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
@@ -316,62 +289,12 @@ $(BINARYTAR): release-only

 binary: $(BINARYTAR)

-$(PKGSRC): release-only
-	rm -rf dist out
-	$(PYTHON) configure --prefix=/ --without-snapshot \
-		--dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
-	$(MAKE) install DESTDIR=dist
-	(cd dist; find * -type f | sort) > packlist
-	pkg_info -X pkg_install | \
-		egrep '^(MACHINE_ARCH|OPSYS|OS_VERSION|PKGTOOLS_VERSION)' > build-info
-	pkg_create -B build-info -c tools/pkgsrc/comment -d tools/pkgsrc/description \
-		-f packlist -I /opt/local -p dist -U $(PKGSRC)
-
-pkgsrc: $(PKGSRC)
-
 dist-upload: $(TARBALL) $(PKG)
 	ssh node@nodejs.org mkdir -p web/nodejs.org/dist/$(VERSION)
 	scp $(TARBALL) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARBALL)
 	scp $(PKG) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARNAME).pkg

-wrkclean:
-	$(MAKE) -C tools/wrk/ clean
-	rm tools/wrk/wrk
-
-wrk: tools/wrk/wrk
-tools/wrk/wrk:
-	$(MAKE) -C tools/wrk/
-
-bench-net: all
-	@$(NODE) benchmark/common.js net
-
-bench-crypto: all
-	@$(NODE) benchmark/common.js crypto
-
-bench-tls: all
-	@$(NODE) benchmark/common.js tls
-
-bench-http: wrk all
-	@$(NODE) benchmark/common.js http
-
-bench-fs: all
-	@$(NODE) benchmark/common.js fs
-
-bench-misc: all
-	@$(MAKE) -C benchmark/misc/function_call/
-	@$(NODE) benchmark/common.js misc
-
-bench-array: all
-	@$(NODE) benchmark/common.js arrays
-
-bench-buffer: all
-	@$(NODE) benchmark/common.js buffers
-
-bench-all: bench bench-misc bench-array bench-buffer
-
-bench: bench-net bench-http bench-fs bench-tls
-
-bench-http-simple:
+bench:
 	 benchmark/http_simple_bench.sh

 bench-idle:
@@ -390,8 +313,4 @@ cpplint:

 lint: jslint cpplint

-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
-	check uninstall install install-includes install-bin all staticlib \
-	dynamiclib test test-all website-upload pkg blog blogclean tar binary \
-	release-only bench-http-simple bench-idle bench-all bench bench-misc \
-	bench-array bench-buffer bench-net bench-http bench-fs bench-tls run-ci
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install install-includes install-bin all staticlib dynamiclib test test-all website-upload pkg blog blogclean tar binary release-only
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@ 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)
@@ -28,19 +27,6 @@ Windows:

    vcbuild.bat

-You can download pre-built binaries for various operating systems from
-[http://nodejs.org/download/](http://nodejs.org/download/).  The Windows
-and OS X installers will prompt you for the location to install to.
-The tarballs are self-contained; you can extract them to a local directory
-with:
-
-    tar xzf /path/to/node-<version>-<platform>-<arch>.tar.gz
-
-Or system-wide with:
-
-    cd /usr/local && tar --strip-components 1 -xzf \
-                         /path/to/node-<version>-<platform>-<arch>.tar.gz
-
 ### To run the tests:

 Unix/Macintosh:
@@ -63,9 +49,9 @@ Resources for Newcomers
 ---
  - [The Wiki](https://github.com/joyent/node/wiki)
  - [nodejs.org](http://nodejs.org/)
-  - [how to install node.js and npm (node package manager)](http://www.joyent.com/blog/installing-node-and-npm/)
+  - [how to install node.js and npm (node package manager)](http://joyeur.com/2010/12/10/installing-node-and-npm/)
  - [list of modules](https://github.com/joyent/node/wiki/modules)
-  - [searching the npm registry](http://npmjs.org/)
+  - [searching the npm registry](http://search.npmjs.org/)
  - [list of companies and projects using node](https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node)
  - [node.js mailing list](http://groups.google.com/group/nodejs)
  - irc chatroom, [#node.js on freenode.net](http://webchat.freenode.net?channels=node.js&uio=d4)
--- a/benchmark/arrays/var-int.js
+++ b/benchmark/arrays/var-int.js
@@ -1,20 +0,0 @@
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  type: 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' '),
-  n: [25]
-});
-
-function main(conf) {
-  var type = conf.type;
-  var clazz = global[type];
-  var n = +conf.n;
-
-  bench.start();
-  var arr = new clazz(n * 1e6);
-  for (var i = 0; i < 10; ++i) {
-    for (var j = 0, k = arr.length; j < k; ++j) {
-      arr[j] = (j ^ k) & 127;
-    }
-  }
-  bench.end(n);
-}
--- a/benchmark/arrays/var_int.js
+++ b/benchmark/arrays/var_int.js
@@ -0,0 +1,15 @@
+var types = 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' ');
+
+var type = types[types.indexOf(process.argv[2])];
+if (!type)
+  type = types[0];
+
+console.error('Benchmarking', type);
+var clazz = global[type];
+
+var arr = new clazz(25 * 10e5);
+for (var i = 0; i < 10; ++i) {
+  for (var j = 0, k = arr.length; j < k; ++j) {
+    arr[j] = (j ^ k) & 127;
+  }
+}
--- a/benchmark/arrays/zero-float.js
+++ b/benchmark/arrays/zero-float.js
@@ -1,20 +0,0 @@
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  type: 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' '),
-  n: [25]
-});
-
-function main(conf) {
-  var type = conf.type;
-  var clazz = global[type];
-  var n = +conf.n;
-
-  bench.start();
-  var arr = new clazz(n * 1e6);
-  for (var i = 0; i < 10; ++i) {
-    for (var j = 0, k = arr.length; j < k; ++j) {
-      arr[j] = 0.0;
-    }
-  }
-  bench.end(n);
-}
--- a/benchmark/arrays/zero-int.js
+++ b/benchmark/arrays/zero-int.js
@@ -1,20 +0,0 @@
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  type: 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' '),
-  n: [25]
-});
-
-function main(conf) {
-  var type = conf.type;
-  var clazz = global[type];
-  var n = +conf.n;
-
-  bench.start();
-  var arr = new clazz(n * 1e6);
-  for (var i = 0; i < 10; ++i) {
-    for (var j = 0, k = arr.length; j < k; ++j) {
-      arr[j] = 0;
-    }
-  }
-  bench.end(n);
-}
--- a/benchmark/arrays/zero_float.js
+++ b/benchmark/arrays/zero_float.js
@@ -0,0 +1,15 @@
+var types = 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' ');
+
+var type = types[types.indexOf(process.argv[2])];
+if (!type)
+  type = types[0];
+
+console.error('Benchmarking', type);
+var clazz = global[type];
+
+var arr = new clazz(25 * 10e5);
+for (var i = 0; i < 10; ++i) {
+  for (var j = 0, k = arr.length; j < k; ++j) {
+    arr[j] = 0.0;
+  }
+}
--- a/benchmark/arrays/zero_int.js
+++ b/benchmark/arrays/zero_int.js
@@ -0,0 +1,15 @@
+var types = 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' ');
+
+var type = types[types.indexOf(process.argv[2])];
+if (!type)
+  type = types[0];
+
+console.error('Benchmarking', type);
+var clazz = global[type];
+
+var arr = new clazz(25 * 10e5);
+for (var i = 0; i < 10; ++i) {
+  for (var j = 0, k = arr.length; j < k; ++j) {
+    arr[j] = 0;
+  }
+}
--- a/benchmark/buffer_creation.js
+++ b/benchmark/buffer_creation.js
@@ -0,0 +1,6 @@
+SlowBuffer = require('buffer').SlowBuffer;
+
+for (var i = 0; i < 1e6; i++) {
+  b = new SlowBuffer(10);
+  b[1] = 2
+}
--- a/benchmark/buffers/buffer-base64-encode.js
+++ b/benchmark/buffers/buffer-base64-encode.js
@@ -1,36 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var common = require('../common.js');
-
-var bench = common.createBenchmark(main, {});
-
-function main(conf) {
-  var N = 64 * 1024 * 1024;
-  var b = Buffer(N);
-  var s = '';
-  for (var i = 0; i < 256; ++i) s += String.fromCharCode(i);
-
-  bench.start();
-  for (var i = 0; i < N; i += 256) b.write(s, i, 256, 'ascii');
-  for (var i = 0; i < 32; ++i) b.toString('base64');
-  bench.end(64);
-}
--- a/benchmark/buffers/buffer-creation.js
+++ b/benchmark/buffers/buffer-creation.js
@@ -1,19 +0,0 @@
-SlowBuffer = require('buffer').SlowBuffer;
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  type: ['fast', 'slow'],
-  len: [10, 1024],
-  n: [1024]
-});
-
-function main(conf) {
-  var len = +conf.len;
-  var n = +conf.n;
-  var clazz = conf.type === 'fast' ? Buffer : SlowBuffer;
-  bench.start();
-  for (var i = 0; i < n * 1024; i++) {
-    b = new clazz(len);
-  }
-  bench.end(n);
-}
--- a/benchmark/buffers/buffer-read.js
+++ b/benchmark/buffers/buffer-read.js
@@ -1,31 +0,0 @@
-var common = require('../common.js');
-
-var bench = common.createBenchmark(main, {
-  noAssert: [false, true],
-  buffer: ['fast', 'slow'],
-  type: ['UInt8', 'UInt16LE', 'UInt16BE',
-         'UInt32LE', 'UInt32BE',
-         'Int8', 'Int16LE', 'Int16BE',
-         'Int32LE', 'Int32BE',
-         'FloatLE', 'FloatBE',
-         'DoubleLE', 'DoubleBE'],
-  millions: [1]
-});
-
-function main(conf) {
-  var noAssert = conf.noAssert === 'true';
-  var len = +conf.millions * 1e6;
-  var clazz = conf.buf === 'fast' ? Buffer : require('buffer').SlowBuffer;
-  var buff = new clazz(8);
-  var fn = 'read' + conf.type;
-
-  buff.writeDoubleLE(0, 0, noAssert);
-  var testFunction = new Function('buff', [
-    "for (var i = 0; i !== " + len + "; i++) {",
-    "  buff." + fn + "(0, " + JSON.stringify(noAssert) + ");",
-    "}"
-  ].join("\n"));
-  bench.start();
-  testFunction(buff);
-  bench.end(len / 1e6);
-}
--- a/benchmark/buffers/buffer-write.js
+++ b/benchmark/buffers/buffer-write.js
@@ -1,69 +0,0 @@
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  noAssert: [false, true],
-  buffer: ['fast', 'slow'],
-  type: ['UInt8', 'UInt16LE', 'UInt16BE',
-         'UInt32LE', 'UInt32BE',
-         'Int8', 'Int16LE', 'Int16BE',
-         'Int32LE', 'Int32BE',
-         'FloatLE', 'FloatBE',
-         'DoubleLE', 'DoubleBE'],
-  millions: [1]
-});
-
-const INT8   = 0x7f;
-const INT16  = 0x7fff;
-const INT32  = 0x7fffffff;
-const UINT8  = (INT8 * 2) + 1;
-const UINT16 = (INT16 * 2) + 1;
-const UINT32 = INT32;
-
-var mod = {
-  writeInt8: INT8,
-  writeInt16BE: INT16,
-  writeInt16LE: INT16,
-  writeInt32BE: INT32,
-  writeInt32LE: INT32,
-  writeUInt8: UINT8,
-  writeUInt16BE: UINT16,
-  writeUInt16LE: UINT16,
-  writeUInt32BE: UINT32,
-  writeUInt32LE: UINT32
-};
-
-function main(conf) {
-  var noAssert = conf.noAssert === 'true';
-  var len = +conf.millions * 1e6;
-  var clazz = conf.buf === 'fast' ? Buffer : require('buffer').SlowBuffer;
-  var buff = new clazz(8);
-  var fn = 'write' + conf.type;
-
-  if (fn.match(/Int/))
-    benchInt(buff, fn, len, noAssert);
-  else
-    benchFloat(buff, fn, len, noAssert);
-}
-
-function benchInt(buff, fn, len, noAssert) {
-  var m = mod[fn];
-  var testFunction = new Function('buff', [
-    "for (var i = 0; i !== " + len + "; i++) {",
-    "  buff." + fn + "(i & " + m + ", 0, " + JSON.stringify(noAssert) + ");",
-    "}"
-  ].join("\n"));
-  bench.start();
-  testFunction(buff);
-  bench.end(len / 1e6);
-}
-
-function benchFloat(buff, fn, len, noAssert) {
-  var testFunction = new Function('buff', [
-    "for (var i = 0; i !== " + len + "; i++) {",
-    "  buff." + fn + "(i, 0, " + JSON.stringify(noAssert) + ");",
-    "}"
-  ].join("\n"));
-  bench.start();
-  testFunction(buff);
-  bench.end(len / 1e6);
-}
--- a/benchmark/buffers/dataview-set.js
+++ b/benchmark/buffers/dataview-set.js
@@ -1,57 +0,0 @@
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  type: ['Uint8', 'Uint16LE', 'Uint16BE',
-         'Uint32LE', 'Uint32BE',
-         'Int8', 'Int16LE', 'Int16BE',
-         'Int32LE', 'Int32BE',
-         'Float32LE', 'Float32BE',
-         'Float64LE', 'Float64BE'],
-  millions: [1]
-});
-
-const INT8   = 0x7f;
-const INT16  = 0x7fff;
-const INT32  = 0x7fffffff;
-const UINT8  = INT8 * 2;
-const UINT16 = INT16 * 2;
-const UINT32 = INT32 * 2;
-
-var mod = {
-  setInt8: INT8,
-  setInt16: INT16,
-  setInt32: INT32,
-  setUint8: UINT8,
-  setUint16: UINT16,
-  setUint32: UINT32
-};
-
-function main(conf) {
-  var len = +conf.millions * 1e6;
-  var ab = new ArrayBuffer(8);
-  var dv = new DataView(ab, 0, 8);
-  var le = /LE$/.test(conf.type);
-  var fn = 'set' + conf.type.replace(/[LB]E$/, '');
-
-  if (/int/i.test(fn))
-    benchInt(dv, fn, len, le);
-  else
-    benchFloat(dv, fn, len, le);
-}
-
-function benchInt(dv, fn, len, le) {
-  var m = mod[fn];
-  bench.start();
-  for (var i = 0; i < len; i++) {
-    dv[fn](0, i % m, le);
-  }
-  bench.end(len / 1e6);
-}
-
-function benchFloat(dv, fn, len, le) {
-  bench.start();
-  for (var i = 0; i < len; i++) {
-    dv[fn](0, i * 0.1, le);
-  }
-  bench.end(len / 1e6);
-}
--- a/benchmark/client_latency.js
+++ b/benchmark/client_latency.js
@@ -0,0 +1,80 @@
+// first start node http_simple.js
+var http = require('http');
+
+var latency = [];
+
+var numRequests = parseInt(process.argv[2], 10) || 100;
+var maxSockets = parseInt(process.argv[3], 10) || 100;
+var runs = parseInt(process.argv[4], 10) || 100;
+var prefix = process.argv[5] || '';
+if (prefix) prefix += '_';
+var r = 0;
+
+var port = parseInt(process.env.PORT, 10) || 8000;
+var host = process.env.HOST || '127.0.0.1';
+
+http.globalAgent.maxSockets = maxSockets;
+
+run();
+
+function run() {
+  if (r++ === runs) {
+    return finish();
+  }
+
+  // make numRequests in parallel
+  // retain the order in which they are *made*.  This requires trapping
+  // each one in a closure, since otherwise, we'll of course end
+  // up mostly sorting them in ascending order, since the cb from a
+  // fast request will almost always be called before the cb from a
+  // slow one.
+  var c = numRequests;
+  var lat = [];
+  latency.push(lat);
+  for (var i = 0; i < numRequests; i++) (function (i) {
+    makeRequest(function(l) {
+      lat[i] = l;
+      c--;
+      if (c === 0) run();
+    });
+  })(i);
+}
+
+function makeRequest(cb) {
+  var opts = { host: host,
+               port: port,
+               uri: 'http://'+host+':'+port+'/bytes/12',
+               forever: true,
+               path: '/bytes/12' };
+  var pre = Date.now();
+  var req = http.get(opts, function(res) {
+    return cb(Date.now() - pre);
+  });
+}
+
+function finish() {
+  var data = [];
+  latency.forEach(function(run, i) {
+    run.forEach(function(l, j) {
+      data[j] = data[j] || [];
+      data[j][i] = l;
+    });
+  });
+
+  data = data.map(function (l, i) {
+    return l.join('\t')
+  }).join('\n') + '\n';
+
+  var fname = prefix +
+              'client_latency_' +
+              numRequests + '_' +
+              maxSockets + '_' +
+              runs + '.tab';
+  var path = require('path');
+  fname = path.resolve(__dirname, '..', 'out', fname);
+  fname = path.relative(process.cwd(), fname);
+  require('fs').writeFile(fname, data, function(er) {
+    if (er) throw er;
+    console.log('written: %s', fname);
+  });
+}
--- a/benchmark/common.js
+++ b/benchmark/common.js
@@ -1,199 +0,0 @@
-var assert = require('assert');
-var path = require('path');
-var silent = +process.env.NODE_BENCH_SILENT;
-
-exports.PORT = process.env.PORT || 12346;
-
-// If this is the main module, then run the benchmarks
-if (module === require.main) {
-  var type = process.argv[2];
-  if (!type) {
-    console.error('usage:\n ./node benchmark/common.js <type>');
-    process.exit(1);
-  }
-
-  var fs = require('fs');
-  var dir = path.join(__dirname, type);
-  var tests = fs.readdirSync(dir);
-  var spawn = require('child_process').spawn;
-
-  runBenchmarks();
-}
-
-function runBenchmarks() {
-  var test = tests.shift();
-  if (!test)
-    return;
-
-  if (test.match(/^[\._]/))
-    return process.nextTick(runBenchmarks);
-
-  console.error(type + '/' + test);
-  test = path.resolve(dir, test);
-
-  var a = (process.execArgv || []).concat(test);
-  var child = spawn(process.execPath, a, { stdio: 'inherit' });
-  child.on('close', function(code) {
-    if (code)
-      process.exit(code);
-    else {
-      console.log('');
-      runBenchmarks();
-    }
-  });
-}
-
-exports.createBenchmark = function(fn, options) {
-  return new Benchmark(fn, options);
-};
-
-function Benchmark(fn, options) {
-  this.fn = fn;
-  this.options = options;
-  this.config = parseOpts(options);
-  this._name = require.main.filename.split(/benchmark[\/\\]/).pop();
-  this._start = [0,0];
-  this._started = false;
-  var self = this;
-  process.nextTick(function() {
-    self._run();
-  });
-}
-
-// benchmark an http server.
-Benchmark.prototype.http = function(p, args, cb) {
-  var self = this;
-  var wrk = path.resolve(__dirname, '..', 'tools', 'wrk', 'wrk');
-  var regexp = /Requests\/sec:[ \t]+([0-9\.]+)/;
-  var spawn = require('child_process').spawn;
-  var url = 'http://127.0.0.1:' + exports.PORT + p;
-
-  args = args.concat(url);
-
-  var out = '';
-  var child = spawn(wrk, args);
-
-  child.stdout.setEncoding('utf8');
-
-  child.stdout.on('data', function(chunk) {
-    out += chunk;
-  });
-
-  child.on('close', function(code) {
-    if (cb)
-      cb(code);
-
-    if (code) {
-      console.error('wrk failed with ' + code);
-      process.exit(code)
-    }
-    var m = out.match(regexp);
-    var qps = m && +m[1];
-    if (!qps) {
-      console.error('%j', out);
-      console.error('wrk produced strange output');
-      process.exit(1);
-    }
-    self.report(+qps);
-  });
-};
-
-Benchmark.prototype._run = function() {
-  if (this.config)
-    return this.fn(this.config);
-
-  // one more more options weren't set.
-  // run with all combinations
-  var main = require.main.filename;
-  var settings = [];
-  var queueLen = 1;
-  var options = this.options;
-
-  var queue = Object.keys(options).reduce(function(set, key) {
-    var vals = options[key];
-    assert(Array.isArray(vals));
-
-    // match each item in the set with each item in the list
-    var newSet = new Array(set.length * vals.length);
-    var j = 0;
-    set.forEach(function(s) {
-      vals.forEach(function(val) {
-        newSet[j++] = s.concat(key + '=' + val);
-      });
-    });
-    return newSet;
-  }, [[main]]);
-
-  var spawn = require('child_process').spawn;
-  var node = process.execPath;
-  var i = 0;
-  function run() {
-    var argv = queue[i++];
-    if (!argv)
-      return;
-    var child = spawn(node, argv, { stdio: 'inherit' });
-    child.on('close', function(code, signal) {
-      if (code)
-        console.error('child process exited with code ' + code);
-      else
-        run();
-    });
-  }
-  run();
-};
-
-function parseOpts(options) {
-  // verify that there's an option provided for each of the options
-  // if they're not *all* specified, then we return null.
-  var keys = Object.keys(options);
-  var num = keys.length;
-  var conf = {};
-  for (var i = 2; i < process.argv.length; i++) {
-    var m = process.argv[i].match(/^(.+)=(.+)$/);
-    if (!m || !m[1] || !m[2] || !options[m[1]])
-      return null;
-    else {
-      conf[m[1]] = isFinite(m[2]) ? +m[2] : m[2]
-      num--;
-    }
-  }
-  // still go ahead and set whatever WAS set, if it was.
-  if (num !== 0) {
-    Object.keys(conf).forEach(function(k) {
-      options[k] = [conf[k]];
-    });
-  }
-  return num === 0 ? conf : null;
-};
-
-Benchmark.prototype.start = function() {
-  if (this._started)
-    throw new Error('Called start more than once in a single benchmark');
-  this._started = true;
-  this._start = process.hrtime();
-};
-
-Benchmark.prototype.end = function(operations) {
-  var elapsed = process.hrtime(this._start);
-  if (!this._started)
-    throw new Error('called end without start');
-  if (typeof operations !== 'number')
-    throw new Error('called end() without specifying operation count');
-  var time = elapsed[0] + elapsed[1]/1e9;
-  var rate = operations/time;
-  this.report(rate);
-};
-
-Benchmark.prototype.report = function(value) {
-  var heading = this.getHeading();
-  if (!silent)
-    console.log('%s: %s', heading, value.toPrecision(5));
-  process.exit(0);
-};
-
-Benchmark.prototype.getHeading = function() {
-  var conf = this.config;
-  return this._name + ' ' + Object.keys(conf).map(function(key) {
-    return key + '=' + conf[key];
-  }).join(' ');
-}
--- a/benchmark/compare.js
+++ b/benchmark/compare.js
@@ -1,151 +0,0 @@
-var usage = 'node benchmark/compare.js ' +
-            '<node-binary1> <node-binary2> ' +
-            '[--html] [--red|-r] [--green|-g]';
-
-var show = 'both';
-var nodes = [];
-var html = false;
-
-for (var i = 2; i < process.argv.length; i++) {
-  var arg = process.argv[i];
-  switch (arg) {
-    case '--red': case '-r':
-      show = show === 'green' ? 'both' : 'red';
-      break;
-    case '--green': case '-g':
-      show = show === 'red' ? 'both' : 'green';
-      break;
-    case '--html':
-      html = true;
-      break;
-    case '-h': case '-?': case '--help':
-      console.log(usage);
-      process.exit(0);
-    default:
-      nodes.push(arg);
-      break;
-  }
-}
-
-if (!html) {
-  var start = '';
-  var green = '\033[1;32m';
-  var red = '\033[1;31m';
-  var reset = '\033[m';
-  var end = '';
-} else {
-  var start = '<pre style="background-color:#333;color:#eee">';
-  var green = '<span style="background-color:#0f0;color:#000">';
-  var red = '<span style="background-color:#f00;color:#fff">';
-  var reset = '</span>';
-  var end = '</pre>';
-}
-
-var runBench = process.env.NODE_BENCH || 'bench';
-
-if (nodes.length !== 2)
-  return console.error('usage:\n  %s', usage);
-
-var spawn = require('child_process').spawn;
-var results = {};
-var toggle = 1;
-var r = (+process.env.NODE_BENCH_RUNS || 1) * 2;
-
-run();
-function run() {
-  if (--r < 0)
-    return compare();
-  toggle = ++toggle % 2;
-
-  var node = nodes[toggle];
-  console.error('running %s', node);
-  var env = {};
-  for (var i in process.env)
-    env[i] = process.env[i];
-  env.NODE = node;
-
-  var out = '';
-  var child = spawn('make', [runBench], { env: env });
-  child.stdout.setEncoding('utf8');
-  child.stdout.on('data', function(c) {
-    out += c;
-  });
-
-  child.stderr.pipe(process.stderr);
-
-  child.on('close', function(code) {
-    if (code) {
-      console.error('%s exited with code=%d', node, code);
-      process.exit(code);
-    } else {
-      out.trim().split(/\r?\n/).forEach(function(line) {
-        line = line.trim();
-        if (!line)
-          return;
-
-        var s = line.split(':');
-        var num = +s.pop();
-        if (!num && num !== 0)
-          return;
-
-        line = s.join(':');
-        var res = results[line] = results[line] || {};
-        res[node] = res[node] || [];
-        res[node].push(num);
-      });
-
-      run();
-    }
-  });
-}
-
-function compare() {
-  // each result is an object with {"foo.js arg=bar":12345,...}
-  // compare each thing, and show which node did the best.
-  // node[0] is shown in green, node[1] shown in red.
-  var maxLen = -Infinity;
-  var util = require('util');
-  console.log(start);
-
-  Object.keys(results).map(function(bench) {
-    var res = results[bench];
-    var n0 = avg(res[nodes[0]]);
-    var n1 = avg(res[nodes[1]]);
-
-    var pct = ((n0 - n1) / n1 * 100).toFixed(2);
-
-    var g = n0 > n1 ? green : '';
-    var r = n0 > n1 ? '' : red;
-    var c = r || g;
-
-    if (show === 'green' && !g || show === 'red' && !r)
-      return;
-
-    var r0 = util.format('%s%s: %d%s', g, nodes[0], n0.toPrecision(5), g ? reset : '');
-    var r1 = util.format('%s%s: %d%s', r, nodes[1], n1.toPrecision(5), r ? reset : '');
-    var pct = c + pct + '%' + reset;
-    var l = util.format('%s: %s %s', bench, r0, r1);
-    maxLen = Math.max(l.length + pct.length, maxLen);
-    return [l, pct];
-  }).filter(function(l) {
-    return l;
-  }).forEach(function(line) {
-    var l = line[0];
-    var pct = line[1];
-    var dotLen = maxLen - l.length - pct.length + 2;
-    var dots = ' ' + new Array(Math.max(0, dotLen)).join('.') + ' ';
-    console.log(l + dots + pct);
-  });
-  console.log(end);
-}
-
-function avg(list) {
-  if (list.length >= 3) {
-    list = list.sort();
-    var q = Math.floor(list.length / 4) || 1;
-    list = list.slice(q, -q);
-  }
-  return list.reduce(function(a, b) {
-    return a + b;
-  }, 0) / list.length;
-}
--- a/benchmark/crypto/cipher-stream.js
+++ b/benchmark/crypto/cipher-stream.js
@@ -1,101 +0,0 @@
-var common = require('../common.js');
-
-var bench = common.createBenchmark(main, {
-  writes: [500],
-  cipher: [ 'AES192', 'AES256' ],
-  type: ['asc', 'utf', 'buf'],
-  len: [2, 1024, 102400, 1024 * 1024],
-  api: ['legacy', 'stream']
-});
-
-function main(conf) {
-  var api = conf.api;
-  if (api === 'stream' && process.version.match(/^v0\.[0-8]\./)) {
-    console.error('Crypto streams not available until v0.10');
-    // use the legacy, just so that we can compare them.
-    api = 'legacy';
-  }
-
-  var crypto = require('crypto');
-  var assert = require('assert');
-  var alice = crypto.getDiffieHellman('modp5');
-  var bob = crypto.getDiffieHellman('modp5');
-
-  alice.generateKeys();
-  bob.generateKeys();
-
-
-  var pubEnc = /^v0\.[0-8]/.test(process.version) ? 'binary' : null;
-  var alice_secret = alice.computeSecret(bob.getPublicKey(), pubEnc, 'hex');
-  var bob_secret = bob.computeSecret(alice.getPublicKey(), pubEnc, 'hex');
-
-  // alice_secret and bob_secret should be the same
-  assert(alice_secret == bob_secret);
-
-  var alice_cipher = crypto.createCipher(conf.cipher, alice_secret);
-  var bob_cipher = crypto.createDecipher(conf.cipher, bob_secret);
-
-  var message;
-  var encoding;
-  switch (conf.type) {
-    case 'asc':
-      message = new Array(conf.len + 1).join('a');
-      encoding = 'ascii';
-      break;
-    case 'utf':
-      message = new Array(conf.len / 2 + 1).join('ü');
-      encoding = 'utf8';
-      break;
-    case 'buf':
-      message = new Buffer(conf.len);
-      message.fill('b');
-      break;
-    default:
-      throw new Error('unknown message type: ' + conf.type);
-  }
-
-  var fn = api === 'stream' ? streamWrite : legacyWrite;
-
-  // write data as fast as possible to alice, and have bob decrypt.
-  // use old API for comparison to v0.8
-  bench.start();
-  fn(alice_cipher, bob_cipher, message, encoding, conf.writes);
-}
-
-function streamWrite(alice, bob, message, encoding, writes) {
-  var written = 0;
-  bob.on('data', function(c) {
-    written += c.length;
-  });
-
-  bob.on('end', function() {
-    // Gbits
-    var bits = written * 8;
-    var gbits = bits / (1024 * 1024 * 1024);
-    bench.end(gbits);
-  });
-
-  alice.pipe(bob);
-
-  while (writes-- > 0)
-    alice.write(message, encoding);
-
-  alice.end();
-}
-
-function legacyWrite(alice, bob, message, encoding, writes) {
-  var written = 0;
-  for (var i = 0; i < writes; i++) {
-    var enc = alice.update(message, encoding);
-    var dec = bob.update(enc);
-    written += dec.length;
-  }
-  var enc = alice.final();
-  var dec = bob.update(enc);
-  written += dec.length;
-  dec = bob.final();
-  written += dec.length;
-  var bits = written * 8;
-  var gbits = written / (1024 * 1024 * 1024);
-  bench.end(gbits);
-}
--- a/benchmark/crypto/hash-stream-creation.js
+++ b/benchmark/crypto/hash-stream-creation.js
@@ -1,86 +0,0 @@
-// throughput benchmark
-// creates a single hasher, then pushes a bunch of data through it
-var common = require('../common.js');
-var crypto = require('crypto');
-
-var bench = common.createBenchmark(main, {
-  writes: [500],
-  algo: [ 'sha256', 'md5' ],
-  type: ['asc', 'utf', 'buf'],
-  out: ['hex', 'binary', 'buffer'],
-  len: [2, 1024, 102400, 1024 * 1024],
-  api: ['legacy', 'stream']
-});
-
-function main(conf) {
-  var api = conf.api;
-  if (api === 'stream' && process.version.match(/^v0\.[0-8]\./)) {
-    console.error('Crypto streams not available until v0.10');
-    // use the legacy, just so that we can compare them.
-    api = 'legacy';
-  }
-
-  var crypto = require('crypto');
-  var assert = require('assert');
-
-  var message;
-  var encoding;
-  switch (conf.type) {
-    case 'asc':
-      message = new Array(conf.len + 1).join('a');
-      encoding = 'ascii';
-      break;
-    case 'utf':
-      message = new Array(conf.len / 2 + 1).join('ü');
-      encoding = 'utf8';
-      break;
-    case 'buf':
-      message = new Buffer(conf.len);
-      message.fill('b');
-      break;
-    default:
-      throw new Error('unknown message type: ' + conf.type);
-  }
-
-  var fn = api === 'stream' ? streamWrite : legacyWrite;
-
-  bench.start();
-  fn(conf.algo, message, encoding, conf.writes, conf.len, conf.out);
-}
-
-function legacyWrite(algo, message, encoding, writes, len, outEnc) {
-  var written = writes * len;
-  var bits = written * 8;
-  var gbits = bits / (1024 * 1024 * 1024);
-
-  while (writes-- > 0) {
-    var h = crypto.createHash(algo);
-    h.update(message, encoding);
-    var res = h.digest(outEnc);
-
-    // include buffer creation costs for older versions
-    if (outEnc === 'buffer' && typeof res === 'string')
-      res = new Buffer(res, 'binary');
-  }
-
-  bench.end(gbits);
-}
-
-function streamWrite(algo, message, encoding, writes, len, outEnc) {
-  var written = writes * len;
-  var bits = written * 8;
-  var gbits = bits / (1024 * 1024 * 1024);
-
-  while (writes-- > 0) {
-    var h = crypto.createHash(algo);
-
-    if (outEnc !== 'buffer')
-      h.setEncoding(outEnc);
-
-    h.write(message, encoding);
-    h.end();
-    h.read();
-  }
-
-  bench.end(gbits);
-}
--- a/benchmark/crypto/hash-stream-throughput.js
+++ b/benchmark/crypto/hash-stream-throughput.js
@@ -1,77 +0,0 @@
-// throughput benchmark
-// creates a single hasher, then pushes a bunch of data through it
-var common = require('../common.js');
-var crypto = require('crypto');
-
-var bench = common.createBenchmark(main, {
-  writes: [500],
-  algo: [ 'sha256', 'md5' ],
-  type: ['asc', 'utf', 'buf'],
-  len: [2, 1024, 102400, 1024 * 1024],
-  api: ['legacy', 'stream']
-});
-
-function main(conf) {
-  var api = conf.api;
-  if (api === 'stream' && process.version.match(/^v0\.[0-8]\./)) {
-    console.error('Crypto streams not available until v0.10');
-    // use the legacy, just so that we can compare them.
-    api = 'legacy';
-  }
-
-  var crypto = require('crypto');
-  var assert = require('assert');
-
-  var message;
-  var encoding;
-  switch (conf.type) {
-    case 'asc':
-      message = new Array(conf.len + 1).join('a');
-      encoding = 'ascii';
-      break;
-    case 'utf':
-      message = new Array(conf.len / 2 + 1).join('ü');
-      encoding = 'utf8';
-      break;
-    case 'buf':
-      message = new Buffer(conf.len);
-      message.fill('b');
-      break;
-    default:
-      throw new Error('unknown message type: ' + conf.type);
-  }
-
-  var fn = api === 'stream' ? streamWrite : legacyWrite;
-
-  bench.start();
-  fn(conf.algo, message, encoding, conf.writes, conf.len);
-}
-
-function legacyWrite(algo, message, encoding, writes, len) {
-  var written = writes * len;
-  var bits = written * 8;
-  var gbits = bits / (1024 * 1024 * 1024);
-  var h = crypto.createHash(algo);
-
-  while (writes-- > 0)
-    h.update(message, encoding);
-
-  h.digest();
-
-  bench.end(gbits);
-}
-
-function streamWrite(algo, message, encoding, writes, len) {
-  var written = writes * len;
-  var bits = written * 8;
-  var gbits = bits / (1024 * 1024 * 1024);
-  var h = crypto.createHash(algo);
-
-  while (writes-- > 0)
-    h.write(message, encoding);
-
-  h.end();
-  h.read();
-
-  bench.end(gbits);
-}
--- a/benchmark/fast_buffer2.js
+++ b/benchmark/fast_buffer2.js
@@ -0,0 +1,42 @@
+var SlowBuffer = require('buffer').SlowBuffer;
+var POOLSIZE = 8*1024;
+var pool;
+
+function allocPool () {
+  pool = new SlowBuffer(POOLSIZE);
+  pool.used = 0;
+}
+
+function FastBuffer (length) {
+  this.length = length;
+
+  if (length > POOLSIZE) {
+    // Big buffer, just alloc one.
+    this.parent = new Buffer(length);
+    this.offset = 0;
+  } else {
+    // Small buffer.
+    if (!pool || pool.length - pool.used < length) allocPool();
+    this.parent = pool;
+    this.offset = pool.used;
+    pool.used += length;
+  }
+
+  // HERE HERE HERE
+  SlowBuffer.makeFastBuffer(this.parent, this, this.offset, this.length);
+}
+
+exports.FastBuffer = FastBuffer;
+
+FastBuffer.prototype.get = function (i) {
+  if (i < 0 || i >= this.length) throw new Error("oob");
+  return this.parent[this.offset + i];
+};
+
+FastBuffer.prototype.set = function (i, v) {
+  if (i < 0 || i >= this.length) throw new Error("oob");
+  return this.parent[this.offset + i] = v;
+};
+
+// TODO define slice, toString, write, etc.
+// slice should not use c++
--- a/benchmark/fast_buffer2_creation.js
+++ b/benchmark/fast_buffer2_creation.js
@@ -0,0 +1,6 @@
+
+FastBuffer = require('./fast_buffer2').FastBuffer;
+for (var i = 0; i < 1e6; i++) {
+  b = new FastBuffer(10);
+  b[1] = 2;
+}
--- a/benchmark/fast_buffer_creation.js
+++ b/benchmark/fast_buffer_creation.js
@@ -0,0 +1,4 @@
+for (var i = 0; i < 1e6; i++) {
+  b = new Buffer(10);
+  b[1] = 2;
+}
--- a/benchmark/fs-readfile.js
+++ b/benchmark/fs-readfile.js
@@ -0,0 +1,72 @@
+// Call fs.readFile over and over again really fast.
+// Then see how many times it got called.
+// Yes, this is a silly benchmark.  Most benchmarks are silly.
+
+var path = require('path');
+var filename = path.resolve(__dirname, 'http.sh');
+var fs = require('fs');
+var count = 0;
+var go = true;
+var len = -1;
+var assert = require('assert');
+
+var concurrency = 1;
+var encoding = null;
+var time = 10;
+
+for (var i = 2; i < process.argv.length; i++) {
+  var arg = process.argv[i];
+  if (arg.match(/^-e$/)) {
+    encoding = process.argv[++i] || null;
+  } else if (arg.match(/^-c$/)) {
+    concurrency = ~~process.argv[++i];
+    if (concurrency < 1) concurrency = 1;
+  } else if (arg === '-t') {
+    time = ~~process.argv[++i];
+    if (time < 1) time = 1;
+  }
+}
+
+
+setTimeout(function() {
+  go = false;
+}, time * 1000);
+
+function round(n) {
+  return Math.floor(n * 100) / 100;
+}
+
+var start = process.hrtime();
+while (concurrency--) readFile();
+
+function readFile() {
+  if (!go) {
+    process.stdout.write('\n');
+    console.log('read the file %d times (higher is better)', count);
+    var end = process.hrtime();
+    var elapsed = [end[0] - start[0], end[1] - start[1]];
+    var ns = elapsed[0] * 1E9 + elapsed[1];
+    var nsper = round(ns / count);
+    console.log('%d ns per read (lower is better)', nsper);
+    var readsper = round(count / (ns / 1E9));
+    console.log('%d reads per sec (higher is better)', readsper);
+    process.exit(0);
+    return;
+  }
+
+  if (!(count % 1000)) {
+    process.stdout.write('.');
+  }
+
+  if (encoding) fs.readFile(filename, encoding, then);
+  else fs.readFile(filename, then);
+
+  function then(er, data) {
+    assert.ifError(er);
+    count++;
+    // basic sanity test: we should get the same number of bytes each time.
+    if (count === 1) len = data.length;
+    else assert(len === data.length);
+    readFile();
+  }
+}
--- a/benchmark/fs-write-stream-throughput.js
+++ b/benchmark/fs-write-stream-throughput.js
@@ -1,96 +0,0 @@
-
-// If there are no args, then this is the root.  Run all the benchmarks!
-if (!process.argv[2])
-  parent();
-else
-  runTest(+process.argv[2], +process.argv[3], process.argv[4]);
-
-function parent() {
-  var types = [ 'string', 'buffer' ];
-  var durs = [ 1, 5 ];
-  var sizes = [ 1, 10, 100, 2048, 10240 ];
-  var queue = [];
-  types.forEach(function(t) {
-    durs.forEach(function(d) {
-      sizes.forEach(function(s) {
-        queue.push([__filename, d, s, t]);
-      });
-    });
-  });
-
-  var spawn = require('child_process').spawn;
-  var node = process.execPath;
-
-  run();
-
-  function run() {
-    var args = queue.shift();
-    if (!args)
-      return;
-    var child = spawn(node, args, { stdio: 'inherit' });
-    child.on('close', function(code, signal) {
-      if (code)
-        throw new Error('Benchmark failed: ' + args.slice(1));
-      run();
-    });
-  }
-}
-
-function runTest(dur, size, type) {
-  if (type !== 'string')
-    type = 'buffer';
-  switch (type) {
-    case 'string':
-      var chunk = new Array(size + 1).join('a');
-      break;
-    case 'buffer':
-      var chunk = new Buffer(size);
-      chunk.fill('a');
-      break;
-  }
-
-  var writes = 0;
-  var fs = require('fs');
-  try { fs.unlinkSync('write_stream_throughput'); } catch (e) {}
-
-  var start
-  var end;
-  function done() {
-    var time = end[0] + end[1]/1E9;
-    var written = fs.statSync('write_stream_throughput').size / 1024;
-    var rate = (written / time).toFixed(2);
-    console.log('fs_write_stream_dur_%d_size_%d_type_%s: %d',
-                dur, size, type, rate);
-
-    try { fs.unlinkSync('write_stream_throughput'); } catch (e) {}
-  }
-
-  var f = require('fs').createWriteStream('write_stream_throughput');
-  f.on('drain', write);
-  f.on('open', write);
-  f.on('close', done);
-
-  // streams2 fs.WriteStreams will let you send a lot of writes into the
-  // buffer before returning false, so capture the *actual* end time when
-  // all the bytes have been written to the disk, indicated by 'finish'
-  f.on('finish', function() {
-    end = process.hrtime(start);
-  });
-
-  var ending = false;
-  function write() {
-    // don't try to write after we end, even if a 'drain' event comes.
-    // v0.8 streams are so sloppy!
-    if (ending)
-      return;
-
-    start = start || process.hrtime();
-    while (false !== f.write(chunk));
-    end = process.hrtime(start);
-
-    if (end[0] >= dur) {
-      ending = true;
-      f.end();
-    }
-  }
-}
--- a/benchmark/fs/read-stream-throughput.js
+++ b/benchmark/fs/read-stream-throughput.js
@@ -1,87 +0,0 @@
-// test the througput of the fs.WriteStream class.
-
-var path = require('path');
-var common = require('../common.js');
-var filename = path.resolve(__dirname, '.removeme-benchmark-garbage');
-var fs = require('fs');
-var filesize = 1000 * 1024 * 1024;
-var assert = require('assert');
-
-var type, encoding, size;
-
-var bench = common.createBenchmark(main, {
-  type: ['buf', 'asc', 'utf'],
-  size: [1024, 4096, 65535, 1024*1024]
-});
-
-function main(conf) {
-  type = conf.type;
-  size = +conf.size;
-
-  switch (type) {
-    case 'buf':
-      encoding = null;
-      break;
-    case 'asc':
-      encoding = 'ascii';
-      break;
-    case 'utf':
-      encoding = 'utf8';
-      break;
-    default:
-      throw new Error('invalid type');
-  }
-
-  makeFile(runTest);
-}
-
-function runTest() {
-  assert(fs.statSync(filename).size === filesize);
-  var rs = fs.createReadStream(filename, {
-    bufferSize: size,
-    encoding: encoding
-  });
-
-  rs.on('open', function() {
-    bench.start();
-  });
-
-  var bytes = 0;
-  rs.on('data', function(chunk) {
-    bytes += chunk.length;
-  });
-
-  rs.on('end', function() {
-    try { fs.unlinkSync(filename); } catch (e) {}
-    // MB/sec
-    bench.end(bytes / (1024 * 1024));
-  });
-}
-
-function makeFile() {
-  var buf = new Buffer(filesize / 1024);
-  if (encoding === 'utf8') {
-    // ü
-    for (var i = 0; i < buf.length; i++) {
-      buf[i] = i % 2 === 0 ? 0xC3 : 0xBC;
-    }
-  } else if (encoding === 'ascii') {
-    buf.fill('a');
-  } else {
-    buf.fill('x');
-  }
-
-  try { fs.unlinkSync(filename); } catch (e) {}
-  var w = 1024;
-  var ws = fs.createWriteStream(filename);
-  ws.on('close', runTest);
-  ws.on('drain', write);
-  write();
-  function write() {
-    do {
-      w--;
-    } while (false !== ws.write(buf) && w > 0);
-    if (w === 0)
-      ws.end();
-  }
-}
--- a/benchmark/fs/readfile.js
+++ b/benchmark/fs/readfile.js
@@ -1,48 +0,0 @@
-// Call fs.readFile over and over again really fast.
-// Then see how many times it got called.
-// Yes, this is a silly benchmark.  Most benchmarks are silly.
-
-var path = require('path');
-var common = require('../common.js');
-var filename = path.resolve(__dirname, '.removeme-benchmark-garbage');
-var fs = require('fs');
-
-var bench = common.createBenchmark(main, {
-  dur: [5],
-  len: [1024, 16 * 1024 * 1024],
-  concurrent: [1, 10]
-});
-
-function main(conf) {
-  var len = +conf.len;
-  try { fs.unlinkSync(filename); } catch (e) {}
-  var data = new Buffer(len);
-  data.fill('x');
-  fs.writeFileSync(filename, data);
-  data = null;
-
-  var reads = 0;
-  bench.start();
-  setTimeout(function() {
-    bench.end(reads);
-    try { fs.unlinkSync(filename); } catch (e) {}
-  }, +conf.dur * 1000);
-
-  function read() {
-    fs.readFile(filename, afterRead);
-  }
-
-  function afterRead(er, data) {
-    if (er)
-      throw er;
-
-    if (data.length !== len)
-      throw new Error('wrong number of bytes returned');
-
-    reads++;
-    read();
-  }
-
-  var cur = +conf.concurrent;
-  while (cur--) read();
-}
--- a/benchmark/fs/write-stream-throughput.js
+++ b/benchmark/fs/write-stream-throughput.js
@@ -1,78 +0,0 @@
-// test the througput of the fs.WriteStream class.
-
-var path = require('path');
-var common = require('../common.js');
-var filename = path.resolve(__dirname, '.removeme-benchmark-garbage');
-var fs = require('fs');
-
-var bench = common.createBenchmark(main, {
-  dur: [5],
-  type: ['buf', 'asc', 'utf'],
-  size: [2, 1024, 65535, 1024 * 1024]
-});
-
-function main(conf) {
-  var dur = +conf.dur;
-  var type = conf.type;
-  var size = +conf.size;
-  var encoding;
-
-  var chunk;
-  switch (type) {
-    case 'buf':
-      chunk = new Buffer(size);
-      chunk.fill('b');
-      break;
-    case 'asc':
-      chunk = new Array(size + 1).join('a');
-      encoding = 'ascii';
-      break;
-    case 'utf':
-      chunk = new Array(Math.ceil(size/2) + 1).join('ü');
-      encoding = 'utf8';
-      break;
-    default:
-      throw new Error('invalid type');
-  }
-
-  try { fs.unlinkSync(filename); } catch (e) {}
-
-  var started = false;
-  var ending = false;
-  var ended = false;
-  setTimeout(function() {
-    ending = true;
-    f.end();
-  }, dur * 1000);
-
-  var f = fs.createWriteStream(filename);
-  f.on('drain', write);
-  f.on('open', write);
-  f.on('close', done);
-  f.on('finish', function() {
-    ended = true;
-    var written = fs.statSync(filename).size / 1024;
-    try { fs.unlinkSync(filename); } catch (e) {}
-    bench.end(written / 1024);
-  });
-
-
-  function write() {
-    // don't try to write after we end, even if a 'drain' event comes.
-    // v0.8 streams are so sloppy!
-    if (ending)
-      return;
-
-    if (!started) {
-      started = true;
-      bench.start();
-    }
-
-    while (false !== f.write(chunk, encoding));
-  }
-
-  function done() {
-    if (!ended)
-      f.emit('finish');
-  }
-}
--- a/benchmark/function_call/bench.js
+++ b/benchmark/function_call/bench.js
@@ -0,0 +1,43 @@
+var binding = require('./build/default/binding');
+
+c = 0 
+
+function js() {
+  return c++; //(new Date()).getTime();
+}
+
+var cxx = binding.hello;
+
+var i, N = 100000000;
+
+console.log(js());
+console.log(cxx());
+
+
+
+var start = new Date();
+for (i = 0; i < N; i++) {
+  js();
+}
+var jsDiff = new Date() - start;
+console.log(N +" JS function calls: " + jsDiff);
+
+
+var start = new Date();
+for (i = 0; i < N; i++) {
+  cxx();
+}
+var cxxDiff = new Date() - start;
+console.log(N +" C++ function calls: " + cxxDiff);
+
+function toMicro (diff) {
+  return (diff / N) * 1000000;
+}
+
+console.log("\nJS function call speed: %d microseconds", toMicro(jsDiff));
+console.log("C++ function call speed: %d microseconds", toMicro(cxxDiff));
+
+
+console.log("\nJS speedup " + (cxxDiff / jsDiff)); 
+
+
--- a/benchmark/function_call/binding.cc
+++ b/benchmark/function_call/binding.cc
@@ -0,0 +1,19 @@
+#include <v8.h>
+#include <node.h>
+#include <time.h>
+
+using namespace v8;
+
+static int c = 0;
+
+static Handle<Value> Hello(const Arguments& args) {
+  HandleScope scope;
+  //time_t tv = time(NULL);
+  return scope.Close(Integer::New(c++));
+}
+
+extern "C" void init (Handle<Object> target) {
+  HandleScope scope;
+  //target->Set(String::New("hello"), String::New("World"));
+  NODE_SET_METHOD(target, "hello", Hello);
+}
--- a/benchmark/function_call/wscript
+++ b/benchmark/function_call/wscript
@@ -0,0 +1,15 @@
+srcdir = '.'
+blddir = 'build'
+VERSION = '0.0.1'
+
+def set_options(opt):
+  opt.tool_options('compiler_cxx')
+
+def configure(conf):
+  conf.check_tool('compiler_cxx')
+  conf.check_tool('node_addon')
+
+def build(bld):
+  obj = bld.new_task_gen('cxx', 'shlib', 'node_addon')
+  obj.target = 'binding'
+  obj.source = 'binding.cc'
--- a/benchmark/http-flamegraph.sh
+++ b/benchmark/http-flamegraph.sh
@@ -1,116 +0,0 @@
-#!/bin/bash
-cd "$(dirname "$(dirname $0)")"
-
-node=${NODE:-./node}
-
-name=${NAME:-stacks}
-
-if type sysctl &>/dev/null; then
-  # darwin and linux
-  sudo sysctl -w net.inet.ip.portrange.first=12000
-  sudo sysctl -w net.inet.tcp.msl=1000
-  sudo sysctl -w kern.maxfiles=1000000 kern.maxfilesperproc=1000000
-elif type /usr/sbin/ndd &>/dev/null; then
-  # sunos
-  /usr/sbin/ndd -set /dev/tcp tcp_smallest_anon_port 12000
-  /usr/sbin/ndd -set /dev/tcp tcp_largest_anon_port 65535
-  /usr/sbin/ndd -set /dev/tcp tcp_max_buf 2097152
-  /usr/sbin/ndd -set /dev/tcp tcp_xmit_hiwat 1048576
-  /usr/sbin/ndd -set /dev/tcp tcp_recv_hiwat 1048576
-fi
-
-ulimit -n 100000
-$node benchmark/http_simple.js &
-nodepid=$!
-echo "node pid = $nodepid"
-sleep 1
-
-# has to stay alive until dtrace exits
-dtrace -n 'profile-97/pid == '$nodepid' && arg1/{ @[jstack(150, 8000)] = count(); } tick-60s { exit(0); }' \
-  | grep -v _ZN2v88internalL21Builtin_HandleApiCallENS0_12_GLOBAL__N_116BuiltinA \
-  > "$name".src &
-
-dtracepid=$!
-
-echo "dtrace pid = $dtracepid"
-
-sleep 1
-
-test () {
-  c=$1
-  t=$2
-  l=$3
-  k=$4
-  ab $k -t 10 -c $c http://127.0.0.1:8000/$t/$l \
-    2>&1 | grep Req
-}
-
-#test 100 bytes 1024
-#test 10  bytes 100 -k
-#test 100 bytes 1024 -k
-#test 100 bytes 1024 -k
-#test 100 bytes 1024 -k
-
-echo 'Keep going until dtrace stops listening...'
-while pargs $dtracepid &>/dev/null; do
-  test 100 bytes ${LENGTH:-1} -k
-done
-
-kill $nodepid
-
-echo 'Turn the stacks into a svg'
-stackvis dtrace flamegraph-svg < "$name".src > "$name".raw.svg
-
-echo 'Prune tiny stacks out of the graph'
-node -e '
-var infile = process.argv[1];
-var outfile = process.argv[2];
-var output = "";
-var fs = require("fs");
-var input = fs.readFileSync(infile, "utf8");
-
-input = input.split("id=\"details\" > </text>");
-var head = input.shift() + "id=\"details\" > </text>";
-input = input.join("id=\"details\" > </text>");
-
-var tail = "</svg>";
-input = input.split("</svg>")[0];
-
-var minyKept = Infinity;
-var minyOverall = Infinity;
-var rects = input.trim().split(/\n/).filter(function(rect) {
-  var my = rect.match(/y="([0-9\.]+)"/);
-
-  if (!my)
-    return false;
-  var y = +my[1];
-  if (!y)
-    return false;
-  minyOverall = Math.min(minyOverall, y);
-
-  // pluck off everything that will be less than one pixel.
-  var mw = rect.match(/width="([0-9\.]+)"/)
-  if (mw) {
-    var width = +mw[1];
-    if (!(width >= 1))
-      return false;
-  }
-  minyKept = Math.min(minyKept, y);
-  return true;
-});
-
-// move everything up to the top of the page.
-var ydiff = minyKept - minyOverall;
-rects = rects.map(function(rect) {
-  var my = rect.match(/y="([0-9\.]+)"/);
-  var y = +my[1];
-  var newy = y - ydiff;
-  rect = rect.replace(/y="([0-9\.]+)"/, "y=\"" + newy + "\"");
-  return rect;
-});
-
-fs.writeFileSync(outfile, head + "\n" + rects.join("\n") + "\n" + tail);
-' "$name".raw.svg "$name".svg
-
-echo ''
-echo 'done. Results in '"$name"'.svg'
--- a/benchmark/http/client-request-body.js
+++ b/benchmark/http/client-request-body.js
@@ -1,69 +0,0 @@
-// 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);
-  }
-}
--- a/benchmark/http/cluster.js
+++ b/benchmark/http/cluster.js
@@ -1,38 +0,0 @@
-var common = require('../common.js');
-var PORT = common.PORT;
-
-var cluster = require('cluster');
-if (cluster.isMaster) {
-  var bench = common.createBenchmark(main, {
-    // unicode confuses ab on os x.
-    type: ['bytes', 'buffer'],
-    length: [4, 1024, 102400],
-    c: [50, 500]
-  });
-} else {
-  require('../http_simple.js');
-}
-
-function main(conf) {
-  process.env.PORT = PORT;
-  var workers = 0;
-  var w1 = cluster.fork();
-  var w2 = cluster.fork();
-
-  cluster.on('listening', function() {
-    workers++;
-    if (workers < 2)
-      return;
-
-    setTimeout(function() {
-      var path = '/' + conf.type + '/' + conf.length;
-      var args = ['-r', '-t', 5, '-c', conf.c, '-k'];
-      var args = ['-r', 5000, '-t', 8, '-c', conf.c];
-
-      bench.http(path, args, function() {
-        w1.destroy();
-        w2.destroy();
-      });
-    }, 100);
-  });
-}
--- a/benchmark/http/end-vs-write-end.js
+++ b/benchmark/http/end-vs-write-end.js
@@ -1,59 +0,0 @@
-// When calling .end(buffer) right away, this triggers a "hot path"
-// optimization in http.js, to avoid an extra write call.
-//
-// However, the overhead of copying a large buffer is higher than
-// the overhead of an extra write() call, so the hot path was not
-// always as hot as it could be.
-//
-// Verify that our assumptions are valid.
-
-var common = require('../common.js');
-var PORT = common.PORT;
-
-var bench = common.createBenchmark(main, {
-  type: ['asc', 'utf', 'buf'],
-  kb: [64, 128, 256, 1024],
-  c: [100],
-  method: ['write', 'end  '] // two spaces added to line up each row
-});
-
-function main(conf) {
-  http = require('http');
-  var chunk;
-  var len = conf.kb * 1024;
-  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;
-  }
-
-  function write(res) {
-    res.write(chunk);
-    res.end();
-  }
-
-  function end(res) {
-    res.end(chunk);
-  }
-
-  var method = conf.method === 'write' ? write : end;
-  var args = ['-r', 5000, '-t', 8, '-c', conf.c];
-
-  var server = http.createServer(function(req, res) {
-    method(res);
-  });
-
-  server.listen(common.PORT, function() {
-    bench.http('/', args, function() {
-      server.close();
-    });
-  });
-}
--- a/benchmark/http/simple.js
+++ b/benchmark/http/simple.js
@@ -1,23 +0,0 @@
-var common = require('../common.js');
-var PORT = common.PORT;
-
-var bench = common.createBenchmark(main, {
-  // unicode confuses ab on os x.
-  type: ['bytes', 'buffer'],
-  length: [4, 1024, 102400],
-  c: [50, 500]
-});
-
-function main(conf) {
-  process.env.PORT = PORT;
-  var spawn = require('child_process').spawn;
-  var server = require('../http_simple.js');
-  setTimeout(function() {
-    var path = '/' + conf.type + '/' + conf.length; //+ '/' + conf.chunks;
-    var args = ['-r', 5000, '-t', 8, '-c', conf.c];
-
-    bench.http(path, args, function() {
-      server.close();
-    });
-  }, 2000);
-}
--- a/benchmark/http_simple.js
+++ b/benchmark/http_simple.js
@@ -4,6 +4,8 @@ var path = require('path'),

 var port = parseInt(process.env.PORT || 8000);

+console.log('pid ' + process.pid);
+
 var fixed = makeString(20 * 1024, 'C'),
    storedBytes = {},
    storedBuffer = {},
@@ -16,13 +18,13 @@ if (useDomains) {
  var domain = require('domain');
  var gdom = domain.create();
  gdom.on('error', function(er) {
-    console.error('Error on global domain', er);
+    console.log('Error on global domain', er);
    throw er;
  });
  gdom.enter();
 }

-var server = module.exports = http.createServer(function (req, res) {
+var server = http.createServer(function (req, res) {
  if (useDomains) {
    var dom = domain.create();
    dom.add(req);
@@ -41,6 +43,7 @@ var server = module.exports = http.createServer(function (req, res) {
    if (n <= 0)
      throw new Error('bytes called with n <= 0')
    if (storedBytes[n] === undefined) {
+      console.log('create storedBytes[n]');
      storedBytes[n] = makeString(n, 'C');
    }
    body = storedBytes[n];
@@ -50,6 +53,7 @@ var server = module.exports = http.createServer(function (req, res) {
    if (n <= 0)
      throw new Error('buffer called with n <= 0');
    if (storedBuffer[n] === undefined) {
+      console.log('create storedBuffer[n]');
      storedBuffer[n] = new Buffer(n);
      for (var i = 0; i < n; i++) {
        storedBuffer[n][i] = 'C'.charCodeAt(0);
@@ -62,6 +66,7 @@ var server = module.exports = http.createServer(function (req, res) {
    if (n <= 0)
      throw new Error('unicode called with n <= 0');
    if (storedUnicode[n] === undefined) {
+      console.log('create storedUnicode[n]');
      storedUnicode[n] = makeString(n, '\u263A');
    }
    body = storedUnicode[n];
@@ -115,6 +120,9 @@ function makeString(size, c) {
 }

 server.listen(port, function () {
-  if (module === require.main)
-    console.error('Listening at http://127.0.0.1:'+port+'/');
+  console.log('Listening at http://127.0.0.1:'+port+'/');
+});
+
+process.on('exit', function() {
+  console.error('libuv counters', process.uvCounters());
 });
--- a/benchmark/http_simple_bench.sh
+++ b/benchmark/http_simple_bench.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

 SERVER=127.0.0.1
-PORT=${PORT:=8000}
+PORT=8000

 # You may want to configure your TCP settings to make many ports available
 # to node and ab. On macintosh use: 
@@ -19,6 +19,9 @@ if [ $SERVER == "127.0.0.1" ]; then
  sleep 1
 fi

+info=`curl -s http://$SERVER:$PORT/info`
+eval $info
+
 date=`date "+%Y%m%d%H%M%S"`

 ab_hello_world() {
--- a/benchmark/io.c
+++ b/benchmark/io.c
@@ -14,7 +14,7 @@
 
 static int c = 0;
 static int tsize = 1000 * 1048576;
-static const char* path = "/tmp/wt.dat";
+static const char path[] = "/tmp/wt.dat";
 static char buf[65536];

 static uint64_t now(void) {
@@ -45,6 +45,7 @@ static void writetest(int size, size_t bsize)

  for (i = 0; i < size; i += bsize) {
    int rv = write(fd, buf, bsize);
+    if (c++ % 2000 == 0) fprintf(stderr, ".");
    if (rv < 0) {
      perror("write failed");
      exit(254);
@@ -65,7 +66,7 @@ static void writetest(int size, size_t bsize)
  elapsed = (end - start) / 1e6;
  mbps = ((tsize/elapsed)) / 1048576;

-  fprintf(stderr, "Wrote %d bytes in %03fs using %ld byte buffers: %03f\n", size, elapsed, bsize, mbps);
+  fprintf(stderr, "\nWrote %d bytes in %03fs using %ld byte buffers: %03fmB/s\n", size, elapsed, bsize, mbps);
 }

 void readtest(int size, size_t bsize)
@@ -105,13 +106,11 @@ void cleanup() {
  unlink(path);
 }

-int main(int argc, char** argv)
+int main()
 {
  int i;
  int bsizes[] = {1024, 4096, 8192, 16384, 32768, 65536, 0};

-  if (argc > 1) path = argv[1];
-
  for (i = 0; bsizes[i] != 0; i++) {
    writetest(tsize, bsizes[i]);
  }
--- a/benchmark/io.js
+++ b/benchmark/io.js
@@ -0,0 +1,109 @@
+var fs = require('fs');
+var util = require('util');
+var Buffer = require('buffer').Buffer;
+
+var path = "/tmp/wt.dat";
+var tsize = 1000 * 1048576;
+var bsizes = [1024, 4096, 8192, 16384, 32768, 65536];
+
+function bufit(size) {
+  var buf = new Buffer(size);
+  for (var i = 0; i <buf.length ; i += 1) {
+    buf[i] = 33;
+  }
+  return buf;
+}
+
+function once(emitter, name, cb) {
+  function incb() {
+    cb.apply(undefined, arguments);
+    emitter.removeListener(name, incb);
+  }
+  emitter.addListener(name, incb);
+}
+
+c = 0
+
+function writetest(size, bsize) {
+  var s = fs.createWriteStream(path, {'flags': 'w', 'mode': 0644});
+  var remaining = size;
+  var buf = bufit(bsize);
+
+  function dowrite() {
+    var rv = s.write(buf);
+    remaining -= buf.length;
+    if (remaining > 0) {
+      //if (remaining % 90000 == 0) console.error("remaining: %d", remaining);
+      //process.nextTick(dowrite);
+    } else {
+      s.emit('done')
+      s.end();
+    }
+  }
+
+  s.on('drain', function () {
+    dowrite();
+    if (c++ % 2000 == 0) util.print(".");
+  });
+
+  dowrite();
+
+  return s;
+}
+
+function readtest(size, bsize) {
+  var s = fs.createReadStream(path, {'flags': 'r', 'encoding': 'binary', 'mode': 0644, 'bufferSize': bsize});
+  s.addListener("data", function (chunk) {
+    // got a chunk...
+    
+  });
+  return s;
+}
+
+function wt(tsize, bsize, done) {
+  var start = Date.now();
+  s = writetest(tsize, bsize);
+  s.addListener('close', function() {
+    var end = Date.now();
+    var diff = end - start;
+    console.log('Wrote '+ tsize +' bytes in '+  diff/1000 +'s using '+ bsize +' byte buffers: '+  ((tsize/(diff/1000)) / 1048576) +' mB/s');
+    done();
+  });
+}
+
+function rt(tsize, bsize, done) {
+  var start = Date.now();
+  s = readtest(tsize, bsize);
+  s.addListener('close', function() {
+    var end = Date.now();
+    var diff = end - start;
+    console.log('Read '+ tsize +' bytes in '+  diff/1000 +'s using '+ bsize +' byte buffers: '+  ((tsize/(diff/1000)) / 1048576) +' mB/s');
+    done();
+  });
+}
+
+var bs= 0;
+
+function nextwt() {
+  if (bsizes.length <= bs) {
+    bs = 0;
+    nextrt();
+    return;
+  }
+  wt(tsize, bsizes[bs], nextwt);
+  bs += 1;
+}
+
+function nextrt() {
+  if (bsizes.length <= bs) {
+    fs.unlink(path, function (err) {
+      if (err) throw err;
+      console.log('All done!');
+    });
+    return;
+  }
+  rt(tsize, bsizes[bs], nextrt);
+  bs += 1;
+}
+
+nextwt();
--- a/benchmark/misc/child-process-read.js
+++ b/benchmark/misc/child-process-read.js
@@ -1,28 +0,0 @@
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  len: [64, 256, 1024, 4096, 32768],
-  dur: [5]
-});
-
-var spawn = require('child_process').spawn;
-function main(conf) {
-  bench.start();
-
-  var dur = +conf.dur;
-  var len = +conf.len;
-
-  var msg = '"' + Array(len).join('.') + '"';
-  var options = { 'stdio': ['ignore', 'ipc', 'ignore'] };
-  var child = spawn('yes', [msg], options);
-
-  var bytes = 0;
-  child.on('message', function(msg) {
-    bytes += msg.length;
-  });
-
-  setTimeout(function() {
-    child.kill();
-    var gbits = (bytes * 8) / (1024 * 1024 * 1024);
-    bench.end(gbits);
-  }, dur * 1000);
-}
--- a/benchmark/misc/function_call/.gitignore
+++ b/benchmark/misc/function_call/.gitignore
@@ -1 +0,0 @@
-build/
--- a/benchmark/misc/function_call/Makefile
+++ b/benchmark/misc/function_call/Makefile
@@ -1,2 +0,0 @@
-binding:
-	node-gyp rebuild --nodedir=../../..
--- a/benchmark/misc/function_call/binding.cc
+++ b/benchmark/misc/function_call/binding.cc
@@ -1,18 +0,0 @@
-#include <v8.h>
-#include <node.h>
-
-using namespace v8;
-
-static int c = 0;
-
-static Handle<Value> Hello(const Arguments& args) {
-  HandleScope scope;
-  return scope.Close(Integer::New(c++));
-}
-
-extern "C" void init (Handle<Object> target) {
-  HandleScope scope;
-  NODE_SET_METHOD(target, "hello", Hello);
-}
-
-NODE_MODULE(binding, init);
--- a/benchmark/misc/function_call/binding.gyp
+++ b/benchmark/misc/function_call/binding.gyp
@@ -1,8 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'binding',
-      'sources': [ 'binding.cc' ]
-    }
-  ]
-}
--- a/benchmark/misc/function_call/index.js
+++ b/benchmark/misc/function_call/index.js
@@ -1,42 +0,0 @@
-// show the difference between calling a short js function
-// relative to a comparable C++ function.
-// Reports millions of calls per second.
-// Note that JS speed goes up, while cxx speed stays about the same.
-
-var assert = require('assert');
-var common = require('../../common.js');
-
-// this fails when we try to open with a different version of node,
-// which is quite common for benchmarks.  so in that case, just
-// abort quietly.
-
-try {
-  var binding = require('./build/Release/binding');
-} catch (er) {
-  console.error('misc/function_call.js Binding failed to load');
-  process.exit(0);
-}
-var cxx = binding.hello;
-
-var c = 0;
-function js() {
-  return c++;
-}
-
-assert(js() === cxx());
-
-var bench = common.createBenchmark(main, {
-  type: ['js', 'cxx'],
-  millions: [1,10,50]
-});
-
-function main(conf) {
-  var n = +conf.millions * 1e6;
-
-  var fn = conf.type === 'cxx' ? cxx : js;
-  bench.start();
-  for (var i = 0; i < n; i++) {
-    fn();
-  }
-  bench.end(+conf.millions);
-}
--- a/benchmark/misc/next-tick-breadth.js
+++ b/benchmark/misc/next-tick-breadth.js
@@ -1,21 +0,0 @@
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  millions: [2]
-});
-
-function main(conf) {
-  var N = +conf.millions * 1e6;
-  var n = 0;
-
-  function cb() {
-    n++;
-    if (n === N)
-      bench.end(n / 1e6);
-  }
-
-  bench.start();
-  for (var i = 0; i < N; i++) {
-    process.nextTick(cb);
-  }
-}
--- a/benchmark/misc/next-tick-depth.js
+++ b/benchmark/misc/next-tick-depth.js
@@ -1,40 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  millions: [2]
-});
-
-process.maxTickDepth = Infinity;
-
-function main(conf) {
-  var n = +conf.millions * 1e6;
-
-  bench.start();
-  process.nextTick(onNextTick);
-  function onNextTick() {
-    if (--n)
-      process.nextTick(onNextTick);
-    else
-      bench.end(+conf.millions);
-  }
-}
--- a/benchmark/misc/spawn-echo.js
+++ b/benchmark/misc/spawn-echo.js
@@ -1,25 +0,0 @@
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  thousands: [1]
-});
-
-var spawn = require('child_process').spawn;
-function main(conf) {
-  var len = +conf.thousands * 1000;
-
-  bench.start();
-  go(len, len);
-}
-
-function go(n, left) {
-  if (--left === 0)
-    return bench.end(n);
-
-  var child = spawn('echo', ['hello']);
-  child.on('exit', function(code) {
-    if (code)
-      process.exit(code);
-    else
-      go(n, left);
-  });
-}
--- a/benchmark/misc/startup.js
+++ b/benchmark/misc/startup.js
@@ -1,40 +0,0 @@
-var common = require('../common.js');
-var spawn = require('child_process').spawn;
-var path = require('path');
-var emptyJsFile = path.resolve(__dirname, '../../test/fixtures/semicolon.js');
-var starts = 100;
-var i = 0;
-var start;
-
-var bench = common.createBenchmark(startNode, {
-  dur: [1]
-});
-
-function startNode(conf) {
-  var dur = +conf.dur;
-  var go = true;
-  var starts = 0;
-  var open = 0;
-
-  setTimeout(function() {
-    go = false;
-  }, dur * 1000);
-
-  bench.start();
-  start();
-
-  function start() {
-    var node = spawn(process.execPath || process.argv[0], [emptyJsFile]);
-    node.on('exit', function(exitCode) {
-      if (exitCode !== 0) {
-        throw new Error('Error during node startup');
-      }
-      starts++;
-
-      if (go)
-        start();
-      else
-        bench.end(starts);
-    });
-  }
-}
--- a/benchmark/misc/string-creation.js
+++ b/benchmark/misc/string-creation.js
@@ -1,16 +0,0 @@
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  millions: [100]
-})
-
-function main(conf) {
-  var n = +conf.millions * 1e6;
-  bench.start();
-  var s;
-  for (var i = 0; i < n; i++) {
-    s = '01234567890';
-    s[1] = "a";
-  }
-  bench.end(n / 1e6);
-}
--- a/benchmark/misc/timers.js
+++ b/benchmark/misc/timers.js
@@ -1,40 +0,0 @@
-var common = require('../common.js');
-
-var bench = common.createBenchmark(main, {
-  thousands: [500],
-  type: ['depth', 'breadth']
-});
-
-function main(conf) {
-  var n = +conf.thousands * 1e3;
-  if (conf.type === 'breadth')
-    breadth(n);
-  else
-    depth(n);
-}
-
-function depth(N) {
-  var n = 0;
-  bench.start();
-  setTimeout(cb);
-  function cb() {
-    n++;
-    if (n === N)
-      bench.end(N / 1e3);
-    else
-      setTimeout(cb);
-  }
-}
-
-function breadth(N) {
-  var n = 0;
-  bench.start();
-  function cb() {
-    n++;
-    if (n === N)
-      bench.end(N / 1e3);
-  }
-  for (var i = 0; i < N; i++) {
-    setTimeout(cb);
-  }
-}
--- a/benchmark/misc/url.js
+++ b/benchmark/misc/url.js
@@ -1,40 +0,0 @@
-var url = require('url')
-var n = 25 * 100;
-
-var urls = [
-  'http://nodejs.org/docs/latest/api/url.html#url_url_format_urlobj',
-  'http://blog.nodejs.org/',
-  'https://encrypted.google.com/search?q=url&q=site:npmjs.org&hl=en',
-  'javascript:alert("node is awesome");',
-  'some.ran/dom/url.thing?oh=yes#whoo'
-];
-
-var paths = [
-  '../foo/bar?baz=boom',
-  'foo/bar',
-  'http://nodejs.org',
-  './foo/bar?baz'
-];
-
-benchmark('parse()', url.parse);
-benchmark('format()', url.format);
-paths.forEach(function(p) {
-  benchmark('resolve("' + p + '")', function(u) {
-    url.resolve(u, p)
-  });
-});
-
-function benchmark(name, fun) {
-  var timestamp = process.hrtime();
-  for (var i = 0; i < n; ++i) {
-    for (var j = 0, k = urls.length; j < k; ++j) fun(urls[j]);
-  }
-  timestamp = process.hrtime(timestamp);
-
-  var seconds = timestamp[0];
-  var nanos = timestamp[1];
-  var time = seconds + nanos / 1e9;
-  var rate = n / time;
-
-  console.log('misc/url.js %s: %s', name, rate.toPrecision(5));
-}
--- a/benchmark/misc/v8-bench.js
+++ b/benchmark/misc/v8-bench.js
@@ -1,18 +0,0 @@
-// compare with "google-chrome deps/v8/benchmarks/run.html"
-var fs = require('fs');
-var path = require('path');
-var vm = require('vm');
-
-var dir = path.join(__dirname, '..', '..', 'deps', 'v8', 'benchmarks');
-
-global.print = function(s) {
-  if (s === '----') return;
-  console.log('misc/v8_bench.js %s', s);
-};
-
-global.load = function (x) {
-  var source = fs.readFileSync(path.join(dir, x), 'utf8');
-  vm.runInThisContext(source, x);
-}
-
-load('run.js');
--- a/benchmark/net/dgram.js
+++ b/benchmark/net/dgram.js
@@ -1,61 +0,0 @@
-// test UDP send/recv throughput
-
-var common = require('../common.js');
-var PORT = common.PORT;
-
-// `num` is the number of send requests to queue up each time.
-// Keep it reasonably high (>10) otherwise you're benchmarking the speed of
-// event loop cycles more than anything else.
-var bench = common.createBenchmark(main, {
-  len: [1, 64, 256, 1024],
-  num: [100],
-  type: ['send', 'recv'],
-  dur: [5]
-});
-
-var dur;
-var len;
-var num;
-var type;
-var chunk;
-var encoding;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  num = +conf.num;
-  type = conf.type;
-  chunk = new Buffer(len);
-  server();
-}
-
-var dgram = require('dgram');
-
-function server() {
-  var sent = 0;
-  var received = 0;
-  var socket = dgram.createSocket('udp4');
-
-  function onsend() {
-    if (sent++ % num == 0)
-      for (var i = 0; i < num; i++)
-        socket.send(chunk, 0, chunk.length, PORT, '127.0.0.1', onsend);
-  }
-
-  socket.on('listening', function() {
-    bench.start();
-    onsend();
-
-    setTimeout(function() {
-      var bytes = (type === 'send' ? sent : received) * chunk.length;
-      var gbits = (bytes * 8) / (1024 * 1024 * 1024);
-      bench.end(gbits);
-    }, dur * 1000);
-  });
-
-  socket.on('message', function(buf, rinfo) {
-    received++;
-  });
-
-  socket.bind(PORT);
-}
--- a/benchmark/net/net-c2s.js
+++ b/benchmark/net/net-c2s.js
@@ -1,112 +0,0 @@
-// test the speed of .pipe() with sockets
-
-var common = require('../common.js');
-var PORT = common.PORT;
-
-var bench = common.createBenchmark(main, {
-  len: [102400, 1024 * 1024 * 16],
-  type: ['utf', 'asc', 'buf'],
-  dur: [5],
-});
-
-var dur;
-var len;
-var type;
-var chunk;
-var encoding;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  type = conf.type;
-
-  switch (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':
-      encoding = 'ascii';
-      chunk = new Array(len + 1).join('x');
-      break;
-    default:
-      throw new Error('invalid type: ' + type);
-      break;
-  }
-
-  server();
-}
-
-var net = require('net');
-
-function Writer() {
-  this.received = 0;
-  this.writable = true;
-}
-
-Writer.prototype.write = function(chunk, encoding, cb) {
-  this.received += chunk.length;
-
-  if (typeof encoding === 'function')
-    encoding();
-  else if (typeof cb === 'function')
-    cb();
-
-  return true;
-};
-
-// doesn't matter, never emits anything.
-Writer.prototype.on = function() {};
-Writer.prototype.once = function() {};
-Writer.prototype.emit = function() {};
-
-
-function Reader() {
-  this.flow = this.flow.bind(this);
-  this.readable = true;
-}
-
-Reader.prototype.pipe = function(dest) {
-  this.dest = dest;
-  this.flow();
-  return dest;
-};
-
-Reader.prototype.flow = function() {
-  var dest = this.dest;
-  var res = dest.write(chunk, encoding);
-  if (!res)
-    dest.once('drain', this.flow);
-  else
-    process.nextTick(this.flow);
-};
-
-
-function server() {
-  var reader = new Reader();
-  var writer = new Writer();
-
-  // the actual benchmark.
-  var server = net.createServer(function(socket) {
-    socket.pipe(writer);
-  });
-
-  server.listen(PORT, function() {
-    var socket = net.connect(PORT);
-    socket.on('connect', function() {
-      bench.start();
-
-      reader.pipe(socket);
-
-      setTimeout(function() {
-        var bytes = writer.received;
-        var gbits = (bytes * 8) / (1024 * 1024 * 1024);
-        bench.end(gbits);
-      }, dur * 1000);
-    });
-  });
-}
--- a/benchmark/net/net-pipe.js
+++ b/benchmark/net/net-pipe.js
@@ -1,115 +0,0 @@
-// test the speed of .pipe() with sockets
-
-var common = require('../common.js');
-var PORT = common.PORT;
-
-var bench = common.createBenchmark(main, {
-  len: [102400, 1024 * 1024 * 16],
-  type: ['utf', 'asc', 'buf'],
-  dur: [5],
-});
-
-var dur;
-var len;
-var type;
-var chunk;
-var encoding;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  type = conf.type;
-
-  switch (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':
-      encoding = 'ascii';
-      chunk = new Array(len + 1).join('x');
-      break;
-    default:
-      throw new Error('invalid type: ' + type);
-      break;
-  }
-
-  server();
-}
-
-var net = require('net');
-
-function Writer() {
-  this.received = 0;
-  this.writable = true;
-}
-
-Writer.prototype.write = function(chunk, encoding, cb) {
-  this.received += chunk.length;
-
-  if (typeof encoding === 'function')
-    encoding();
-  else if (typeof cb === 'function')
-    cb();
-
-  return true;
-};
-
-// doesn't matter, never emits anything.
-Writer.prototype.on = function() {};
-Writer.prototype.once = function() {};
-Writer.prototype.emit = function() {};
-
-
-function Reader() {
-  this.flow = this.flow.bind(this);
-  this.readable = true;
-}
-
-Reader.prototype.pipe = function(dest) {
-  this.dest = dest;
-  this.flow();
-  return dest;
-};
-
-Reader.prototype.flow = function() {
-  var dest = this.dest;
-  var res = dest.write(chunk, encoding);
-  if (!res)
-    dest.once('drain', this.flow);
-  else
-    process.nextTick(this.flow);
-};
-
-
-function server() {
-  var reader = new Reader();
-  var writer = new Writer();
-
-  // the actual benchmark.
-  var server = net.createServer(function(socket) {
-    socket.pipe(socket);
-  });
-
-  server.listen(PORT, function() {
-    var socket = net.connect(PORT);
-    socket.on('connect', function() {
-      bench.start();
-
-      reader.pipe(socket);
-      socket.pipe(writer);
-
-      setTimeout(function() {
-        // multiply by 2 since we're sending it first one way
-        // then then back again.
-        var bytes = writer.received * 2;
-        var gbits = (bytes * 8) / (1024 * 1024 * 1024);
-        bench.end(gbits);
-      }, dur * 1000);
-    });
-  });
-}
--- a/benchmark/net/net-s2c.js
+++ b/benchmark/net/net-s2c.js
@@ -1,112 +0,0 @@
-// test the speed of .pipe() with sockets
-
-var common = require('../common.js');
-var PORT = common.PORT;
-
-var bench = common.createBenchmark(main, {
-  len: [102400, 1024 * 1024 * 16],
-  type: ['utf', 'asc', 'buf'],
-  dur: [5]
-});
-
-var dur;
-var len;
-var type;
-var chunk;
-var encoding;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  type = conf.type;
-
-  switch (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':
-      encoding = 'ascii';
-      chunk = new Array(len + 1).join('x');
-      break;
-    default:
-      throw new Error('invalid type: ' + type);
-      break;
-  }
-
-  server();
-}
-
-var net = require('net');
-
-function Writer() {
-  this.received = 0;
-  this.writable = true;
-}
-
-Writer.prototype.write = function(chunk, encoding, cb) {
-  this.received += chunk.length;
-
-  if (typeof encoding === 'function')
-    encoding();
-  else if (typeof cb === 'function')
-    cb();
-
-  return true;
-};
-
-// doesn't matter, never emits anything.
-Writer.prototype.on = function() {};
-Writer.prototype.once = function() {};
-Writer.prototype.emit = function() {};
-
-
-function Reader() {
-  this.flow = this.flow.bind(this);
-  this.readable = true;
-}
-
-Reader.prototype.pipe = function(dest) {
-  this.dest = dest;
-  this.flow();
-  return dest;
-};
-
-Reader.prototype.flow = function() {
-  var dest = this.dest;
-  var res = dest.write(chunk, encoding);
-  if (!res)
-    dest.once('drain', this.flow);
-  else
-    process.nextTick(this.flow);
-};
-
-
-function server() {
-  var reader = new Reader();
-  var writer = new Writer();
-
-  // the actual benchmark.
-  var server = net.createServer(function(socket) {
-    reader.pipe(socket);
-  });
-
-  server.listen(PORT, function() {
-    var socket = net.connect(PORT);
-    socket.on('connect', function() {
-      bench.start();
-
-      socket.pipe(writer);
-
-      setTimeout(function() {
-        var bytes = writer.received;
-        var gbits = (bytes * 8) / (1024 * 1024 * 1024);
-        bench.end(gbits);
-      }, dur * 1000);
-    });
-  });
-}
--- a/benchmark/net/tcp-raw-c2s.js
+++ b/benchmark/net/tcp-raw-c2s.js
@@ -1,136 +0,0 @@
-// In this benchmark, we connect a client to the server, and write
-// as many bytes as we can in the specified time (default = 10s)
-
-var common = require('../common.js');
-
-// if there are --dur=N and --len=N args, then
-// run the function with those settings.
-// if not, then queue up a bunch of child processes.
-var bench = common.createBenchmark(main, {
-  len: [102400, 1024 * 1024 * 16],
-  type: ['utf', 'asc', 'buf'],
-  dur: [5]
-});
-
-var TCP = process.binding('tcp_wrap').TCP;
-var PORT = common.PORT;
-
-var dur;
-var len;
-var type;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  type = conf.type;
-  server();
-}
-
-
-function fail(syscall) {
-  var e = new Error(syscall + ' ' + errno);
-  e.errno = e.code = errno;
-  e.syscall = syscall;
-  throw e;
-}
-
-function server() {
-  var serverHandle = new TCP();
-  var r = serverHandle.bind('127.0.0.1', PORT);
-  if (r)
-    fail('bind');
-
-  var r = serverHandle.listen(511);
-  if (r)
-    fail('listen');
-
-  serverHandle.onconnection = function(clientHandle) {
-    if (!clientHandle)
-      fail('connect');
-
-    // the meat of the benchmark is right here:
-    bench.start();
-    var bytes = 0;
-
-    setTimeout(function() {
-      // report in Gb/sec
-      bench.end((bytes * 8) / (1024 * 1024 * 1024));
-    }, dur * 1000);
-
-    clientHandle.onread = function(buffer, offset, length) {
-      // we're not expecting to ever get an EOF from the client.
-      // just lots of data forever.
-      if (!buffer)
-        fail('read');
-
-      // don't slice the buffer.  the point of this is to isolate, not
-      // simulate real traffic.
-      // var chunk = buffer.slice(offset, offset + length);
-      bytes += length;
-    };
-
-    clientHandle.readStart();
-  };
-
-  client();
-}
-
-function client() {
-  var chunk;
-  switch (type) {
-    case 'buf':
-      chunk = new Buffer(len);
-      chunk.fill('x');
-      break;
-    case 'utf':
-      chunk = new Array(len / 2 + 1).join('ü');
-      break;
-    case 'asc':
-      chunk = new Array(len + 1).join('x');
-      break;
-    default:
-      throw new Error('invalid type: ' + type);
-      break;
-  }
-
-  var clientHandle = new TCP();
-  var connectReq = clientHandle.connect('127.0.0.1', PORT);
-
-  if (!connectReq)
-    fail('connect');
-
-  clientHandle.readStart();
-
-  connectReq.oncomplete = function() {
-    while (clientHandle.writeQueueSize === 0)
-      write();
-  };
-
-  function write() {
-    var writeReq
-    switch (type) {
-      case 'buf':
-        writeReq = clientHandle.writeBuffer(chunk);
-        break;
-      case 'utf':
-        writeReq = clientHandle.writeUtf8String(chunk);
-        break;
-      case 'asc':
-        writeReq = clientHandle.writeAsciiString(chunk);
-        break;
-    }
-
-    if (!writeReq)
-      fail('write');
-
-    writeReq.oncomplete = afterWrite;
-  }
-
-  function afterWrite(status, handle, req) {
-    if (status)
-      fail('write');
-
-    while (clientHandle.writeQueueSize === 0)
-      write();
-  }
-}
--- a/benchmark/net/tcp-raw-pipe.js
+++ b/benchmark/net/tcp-raw-pipe.js
@@ -1,149 +0,0 @@
-// In this benchmark, we connect a client to the server, and write
-// as many bytes as we can in the specified time (default = 10s)
-
-var common = require('../common.js');
-
-// if there are --dur=N and --len=N args, then
-// run the function with those settings.
-// if not, then queue up a bunch of child processes.
-var bench = common.createBenchmark(main, {
-  len: [102400, 1024 * 1024 * 16],
-  type: ['utf', 'asc', 'buf'],
-  dur: [5]
-});
-
-var TCP = process.binding('tcp_wrap').TCP;
-var PORT = common.PORT;
-
-var dur;
-var len;
-var type;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  type = conf.type;
-  server();
-}
-
-
-function fail(syscall) {
-  var e = new Error(syscall + ' ' + errno);
-  e.errno = e.code = errno;
-  e.syscall = syscall;
-  throw e;
-}
-
-function server() {
-  var serverHandle = new TCP();
-  var r = serverHandle.bind('127.0.0.1', PORT);
-  if (r)
-    fail('bind');
-
-  var r = serverHandle.listen(511);
-  if (r)
-    fail('listen');
-
-  serverHandle.onconnection = function(clientHandle) {
-    if (!clientHandle)
-      fail('connect');
-
-    clientHandle.onread = function(buffer, offset, length) {
-      // we're not expecting to ever get an EOF from the client.
-      // just lots of data forever.
-      if (!buffer)
-        fail('read');
-
-      var chunk = buffer.slice(offset, offset + length);
-      var writeReq = clientHandle.writeBuffer(chunk);
-
-      if (!writeReq)
-        fail('write');
-
-      writeReq.oncomplete = function(status, handle, req) {
-        if (status)
-          fail('write');
-      };
-    };
-
-    clientHandle.readStart();
-  };
-
-  client();
-}
-
-function client() {
-  var chunk;
-  switch (type) {
-    case 'buf':
-      chunk = new Buffer(len);
-      chunk.fill('x');
-      break;
-    case 'utf':
-      chunk = new Array(len / 2 + 1).join('ü');
-      break;
-    case 'asc':
-      chunk = new Array(len + 1).join('x');
-      break;
-    default:
-      throw new Error('invalid type: ' + type);
-      break;
-  }
-
-  var clientHandle = new TCP();
-  var connectReq = clientHandle.connect('127.0.0.1', PORT);
-  var bytes = 0;
-
-  if (!connectReq)
-    fail('connect');
-
-  clientHandle.readStart();
-
-  clientHandle.onread = function(buffer, start, length) {
-    if (!buffer)
-      fail('read');
-
-    bytes += length;
-  };
-
-  connectReq.oncomplete = function() {
-    bench.start();
-
-    setTimeout(function() {
-      // multiply by 2 since we're sending it first one way
-      // then then back again.
-      bench.end(2 * (bytes * 8) / (1024 * 1024 * 1024));
-    }, dur * 1000);
-
-    while (clientHandle.writeQueueSize === 0)
-      write();
-  };
-
-  function write() {
-    var writeReq
-    switch (type) {
-      case 'buf':
-        writeReq = clientHandle.writeBuffer(chunk);
-        break;
-      case 'utf':
-        writeReq = clientHandle.writeUtf8String(chunk);
-        break;
-      case 'asc':
-        writeReq = clientHandle.writeAsciiString(chunk);
-        break;
-    }
-
-    if (!writeReq)
-      fail('write');
-
-    writeReq.oncomplete = afterWrite;
-  }
-
-  function afterWrite(status, handle, req) {
-    if (status)
-      fail('write');
-
-    while (clientHandle.writeQueueSize === 0)
-      write();
-  }
-}
--- a/benchmark/net/tcp-raw-s2c.js
+++ b/benchmark/net/tcp-raw-s2c.js
@@ -1,136 +0,0 @@
-// In this benchmark, we connect a client to the server, and write
-// as many bytes as we can in the specified time (default = 10s)
-
-var common = require('../common.js');
-
-// if there are dur=N and len=N args, then
-// run the function with those settings.
-// if not, then queue up a bunch of child processes.
-var bench = common.createBenchmark(main, {
-  len: [102400, 1024 * 1024 * 16],
-  type: ['utf', 'asc', 'buf'],
-  dur: [5]
-});
-
-var TCP = process.binding('tcp_wrap').TCP;
-var PORT = common.PORT;
-
-var dur;
-var len;
-var type;
-
-function main(conf) {
-  dur = +conf.dur;
-  len = +conf.len;
-  type = conf.type;
-  server();
-}
-
-
-function fail(syscall) {
-  var e = new Error(syscall + ' ' + errno);
-  e.errno = e.code = errno;
-  e.syscall = syscall;
-  throw e;
-}
-
-function server() {
-  var serverHandle = new TCP();
-  var r = serverHandle.bind('127.0.0.1', PORT);
-  if (r)
-    fail('bind');
-
-  var r = serverHandle.listen(511);
-  if (r)
-    fail('listen');
-
-  serverHandle.onconnection = function(clientHandle) {
-    if (!clientHandle)
-      fail('connect');
-
-    var chunk;
-    switch (type) {
-      case 'buf':
-        chunk = new Buffer(len);
-        chunk.fill('x');
-        break;
-      case 'utf':
-        chunk = new Array(len / 2 + 1).join('ü');
-        break;
-      case 'asc':
-        chunk = new Array(len + 1).join('x');
-        break;
-      default:
-        throw new Error('invalid type: ' + type);
-        break;
-    }
-
-    clientHandle.readStart();
-
-    while (clientHandle.writeQueueSize === 0)
-      write();
-
-    function write() {
-      var writeReq
-      switch (type) {
-        case 'buf':
-          writeReq = clientHandle.writeBuffer(chunk);
-          break;
-        case 'utf':
-          writeReq = clientHandle.writeUtf8String(chunk);
-          break;
-        case 'asc':
-          writeReq = clientHandle.writeAsciiString(chunk);
-          break;
-      }
-
-      if (!writeReq)
-        fail('write');
-
-      writeReq.oncomplete = afterWrite;
-    }
-
-    function afterWrite(status, handle, req) {
-      if (status)
-        fail('write');
-
-      while (clientHandle.writeQueueSize === 0)
-        write();
-    }
-  };
-
-  client();
-}
-
-function client() {
-  var clientHandle = new TCP();
-  var connectReq = clientHandle.connect('127.0.0.1', PORT);
-
-  if (!connectReq)
-    fail('connect');
-
-  connectReq.oncomplete = function() {
-    var bytes = 0;
-    clientHandle.onread = function(buffer, offset, length) {
-      // we're not expecting to ever get an EOF from the client.
-      // just lots of data forever.
-      if (!buffer)
-        fail('read');
-
-      // don't slice the buffer.  the point of this is to isolate, not
-      // simulate real traffic.
-      // var chunk = buffer.slice(offset, offset + length);
-      bytes += length;
-    };
-
-    clientHandle.readStart();
-
-    // the meat of the benchmark is right here:
-    bench.start();
-
-    setTimeout(function() {
-      // report in Gb/sec
-      bench.end((bytes * 8) / (1024 * 1024 * 1024));
-    }, dur * 1000);
-  };
-}
--- a/benchmark/next-tick-2.js
+++ b/benchmark/next-tick-2.js
@@ -0,0 +1,41 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var count = 2e6,
+    left = count,
+    start;
+
+function onNextTick() {
+  if (--left) {
+    process.nextTick(onNextTick);
+  } else {
+    finalize();
+  }  
+}
+
+function finalize() {
+  var duration = (new Date()).getTime() - start,
+      ticksPerSec = count / duration * 1000;
+  console.log("nextTick callbacks per second: " + Math.round(ticksPerSec));
+}
+
+start = (new Date()).getTime();
+process.nextTick(onNextTick);
--- a/benchmark/next-tick.js
+++ b/benchmark/next-tick.js
@@ -0,0 +1,17 @@
+// run with `time node benchmark/next-tick.js`
+var assert = require('assert');
+
+var N = 1e7;
+var n = 0;
+
+process.on('exit', function() {
+  assert.equal(n, N);
+});
+
+function cb() {
+  n++;
+}
+
+for (var i = 0; i < N; ++i) {
+  process.nextTick(cb);
+}
--- a/benchmark/process_loop.js
+++ b/benchmark/process_loop.js
@@ -0,0 +1,19 @@
+var util = require("util"),
+    childProcess = require("child_process");
+
+function next (i) {
+  if (i <= 0) return;
+
+  var child = childProcess.spawn("echo", ["hello"]);
+
+  child.stdout.addListener("data", function (chunk) {
+    util.print(chunk);
+  });
+
+  child.addListener("exit", function (code) {
+    if (code != 0) process.exit(-1);
+    next(i - 1);
+  });
+}
+
+next(500);
--- a/benchmark/run.js
+++ b/benchmark/run.js
@@ -0,0 +1,31 @@
+var path = require("path");
+var util = require("util");
+var childProcess = require("child_process");
+var benchmarks = [ "timers.js"
+                 , "process_loop.js"
+                 , "static_http_server.js"
+                 ];
+
+var benchmarkDir = path.dirname(__filename);
+
+function exec (script, callback) {
+  var start = new Date();
+  var child = childProcess.spawn(process.argv[0], [path.join(benchmarkDir, script)]);
+  child.addListener("exit", function (code) {
+    var elapsed = new Date() - start;
+    callback(elapsed, code);
+  });
+}
+
+function runNext (i) {
+  if (i >= benchmarks.length) return;
+  util.print(benchmarks[i] + ": ");
+  exec(benchmarks[i], function (elapsed, code) {
+    if (code != 0) {
+      console.log("ERROR  ");
+    }
+    console.log(elapsed);
+    runNext(i+1);
+  });
+};
+runNext(0);
--- a/benchmark/settimeout.js
+++ b/benchmark/settimeout.js
@@ -0,0 +1,15 @@
+console.log("wait...");
+var done = 0;
+var N = 5000000;
+var begin = new Date();
+for (var i = 0; i < N; i++) {
+  setTimeout(function () {
+    if (++done == N) {
+      var end = new Date();
+      console.log("smaller is better");
+      console.log("startup: %d", start - begin);
+      console.log("done: %d", end - start);
+    }
+  }, 1000);
+}
+var start = new Date();
--- a/benchmark/startup.js
+++ b/benchmark/startup.js
@@ -0,0 +1,26 @@
+var spawn = require('child_process').spawn,
+    path = require('path'),
+    emptyJsFile = path.join(__dirname, '../test/fixtures/semicolon.js'),
+    starts = 100,
+    i = 0,
+    start;
+
+function startNode() {
+  var node = spawn(process.execPath || process.argv[0], [emptyJsFile]);
+  node.on('exit', function(exitCode) {
+    if (exitCode !== 0) {
+      throw new Error('Error during node startup');
+    }
+
+    i++;
+    if (i < starts) {
+      startNode();
+    } else{
+      var duration = +new Date - start;
+      console.log('Started node %d times in %s ms. %d ms / start.', starts, duration, duration / starts);
+    }
+  });
+}
+
+start = +new Date;
+startNode();
--- a/benchmark/static_http_server.js
+++ b/benchmark/static_http_server.js
@@ -31,7 +31,6 @@ server.listen(port, function() {
      path:  '/',
      agent: agent
    }, function(res) {
-      res.resume();
      res.on('end', function() {
        if (++responses === n) {
          server.close();
--- a/benchmark/string_creation.js
+++ b/benchmark/string_creation.js
@@ -0,0 +1,6 @@
+
+
+for (var i = 0; i < 9e7; i++) {
+  s = '01234567890';
+  s[1] = "a";
+}
--- a/benchmark/throughput-child.js
+++ b/benchmark/throughput-child.js
@@ -0,0 +1,25 @@
+var net = require('net');
+var received = 0;
+var start = new Date();
+var socket = net.connect(8000);
+
+socket.on('data', function(d) {
+  received += d.length;
+});
+
+var interval = setInterval(function() {
+  // After 1 gigabyte shutdown.
+  if (received > 10 * 1024 * 1024 * 1024) {
+    socket.destroy();
+    clearInterval(interval);
+    process.exit(0);
+  } else {
+    // Otherwise print some stats.
+    var now = new Date();
+    var gigabytes = received / (1024 * 1024 * 1024);
+    var gigabits = gigabytes * 8.0;
+    var millisec = now - start;
+    var sec = millisec / 1000;
+    console.log((gigabits / sec) + " gbit/sec")
+  }
+}, 1000);
--- a/benchmark/throughput.js
+++ b/benchmark/throughput.js
@@ -0,0 +1,21 @@
+var fork = require('child_process').fork;
+var net = require('net');
+var buffer = new Buffer(1024 * 1024);
+
+function write(socket) {
+  if (!socket.writable) return;
+
+  socket.write(buffer, function() {
+    write(socket);
+  });
+}
+
+var server = net.createServer(function(socket) {
+  server.close();
+  write(socket);
+});
+
+server.listen(8000, function() {
+  fork(__dirname + '/throughput-child.js');
+});
+
--- a/benchmark/timers.js
+++ b/benchmark/timers.js
@@ -0,0 +1,5 @@
+function next (i) {
+  if (i <= 0) return;
+  setTimeout(function () { next(i-1); }, 1);
+}
+next(700);
--- a/benchmark/tls-connect.js
+++ b/benchmark/tls-connect.js
@@ -0,0 +1,86 @@
+
+var assert = require('assert'),
+    fs = require('fs'),
+    path = require('path'),
+    tls = require('tls');
+
+
+var target_connections = 10000,
+    concurrency = 10;
+
+for (var i = 2; i < process.argv.length; i++) {
+  switch (process.argv[i]) {
+    case '-c':
+      concurrency = ~~process.argv[++i];
+      break;
+
+    case '-n':
+      target_connections = ~~process.argv[++i];
+      break;
+
+    default:
+      throw new Error('Invalid flag: ' + process.argv[i]);
+  }
+}
+
+
+var cert_dir = path.resolve(__dirname, '../test/fixtures'),
+    options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
+                cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
+                ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ] };
+
+var server = tls.createServer(options, onConnection);
+server.listen(8000);
+
+
+var initiated_connections = 0,
+    server_connections = 0,
+    client_connections = 0,
+    start = Date.now();
+
+for (var i = 0; i < concurrency; i++)
+  makeConnection();
+
+
+process.on('exit', onExit);
+
+
+function makeConnection() {
+  if (initiated_connections >= target_connections)
+    return;
+
+  initiated_connections++;
+
+  var conn = tls.connect(8000, function() {
+    client_connections++;
+
+    if (client_connections % 100 === 0)
+      console.log(client_connections + ' of ' + target_connections +
+                  ' connections made');
+
+    conn.end();
+    makeConnection();
+  });
+}
+
+
+function onConnection(conn) {
+  server_connections++;
+
+  if (server_connections === target_connections)
+    server.close();
+}
+
+
+function onExit() {
+  var end = Date.now(),
+      s = (end - start) / 1000,
+      persec = Math.round(target_connections / s);
+
+  assert.equal(initiated_connections, target_connections);
+  assert.equal(client_connections, target_connections);
+  assert.equal(server_connections, target_connections);
+
+  console.log('%d connections in %d s', target_connections, s);
+  console.log('%d connections per second', persec);
+}
--- a/benchmark/tls-fragmentation.js
+++ b/benchmark/tls-fragmentation.js
@@ -0,0 +1,63 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+if (!process.versions.openssl) {
+  console.error('Skipping because node compiled without OpenSSL.');
+  process.exit(0);
+}
+
+var common = require('../common');
+var assert = require('assert');
+var tls = require('tls');
+var fs = require('fs');
+var path = require('path');
+
+var options = {
+  key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
+  cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
+};
+
+var fragment = 'fr';
+var dataSize = 1024 * 1024;
+var sent = 0;
+var received = 0;
+
+var server = tls.createServer(options, function (stream) {
+  for (sent = 0; sent <= dataSize; sent += fragment.length) {
+    stream.write(fragment);
+  }
+  stream.end();
+});
+
+server.listen(common.PORT, function () {
+  var client = tls.connect(common.PORT, function () {
+    client.on('data', function (data) {
+      received += data.length;
+    });
+    client.on('end', function () {
+      server.close();
+    });
+  });
+});
+
+process.on('exit', function () {
+  assert.equal(sent, received);
+});
--- a/benchmark/tls/throughput.js
+++ b/benchmark/tls/throughput.js
@@ -1,74 +0,0 @@
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  dur: [5],
-  type: ['buf', 'asc', 'utf'],
-  size: [2, 1024, 1024 * 1024]
-});
-
-var dur, type, encoding, size;
-var server;
-
-var path = require('path');
-var fs = require('fs');
-var cert_dir = path.resolve(__dirname, '../../test/fixtures');
-var options;
-var tls = require('tls');
-
-function main(conf) {
-  dur = +conf.dur;
-  type = conf.type;
-  size = +conf.size;
-
-  var chunk;
-  switch (type) {
-    case 'buf':
-      chunk = new Buffer(size);
-      chunk.fill('b');
-      break;
-    case 'asc':
-      chunk = new Array(size + 1).join('a');
-      encoding = 'ascii';
-      break;
-    case 'utf':
-      chunk = new Array(size/2 + 1).join('ü');
-      encoding = 'utf8';
-      break;
-    default:
-      throw new Error('invalid type');
-  }
-
-  options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
-              cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
-              ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ] };
-
-  server = tls.createServer(options, onConnection);
-  setTimeout(done, dur * 1000);
-  server.listen(common.PORT, function() {
-    var opt = { port: common.PORT, rejectUnauthorized: false };
-    var conn = tls.connect(opt, function() {
-      bench.start();
-      conn.on('drain', write);
-      write();
-    });
-
-    function write() {
-      var i = 0;
-      while (false !== conn.write(chunk, encoding));
-    }
-  });
-
-  var received = 0;
-  function onConnection(conn) {
-    conn.on('data', function(chunk) {
-      received += chunk.length;
-    });
-  }
-
-  function done() {
-    var mbits = (received * 8) / (1024 * 1024);
-    bench.end(mbits);
-    conn.destroy();
-    server.close();
-  }
-}
-
--- a/benchmark/tls/tls-connect.js
+++ b/benchmark/tls/tls-connect.js
@@ -1,63 +0,0 @@
-var assert = require('assert'),
-    fs = require('fs'),
-    path = require('path'),
-    tls = require('tls');
-
-var common = require('../common.js');
-var bench = common.createBenchmark(main, {
-  concurrency: [1, 10],
-  dur: [5]
-});
-
-var clientConn = 0;
-var serverConn = 0;
-var server;
-var dur;
-var concurrency;
-var running = true;
-
-function main(conf) {
-  dur = +conf.dur;
-  concurrency = +conf.concurrency;
-
-  var cert_dir = path.resolve(__dirname, '../../test/fixtures'),
-      options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
-                  cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
-                  ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ] };
-
-  server = tls.createServer(options, onConnection);
-  server.listen(common.PORT, onListening);
-}
-
-function onListening() {
-  setTimeout(done, dur * 1000);
-  bench.start();
-  for (var i = 0; i < concurrency; i++)
-    makeConnection();
-}
-
-function onConnection(conn) {
-  serverConn++;
-}
-
-function makeConnection() {
-  var conn = tls.connect({ port: common.PORT,
-                           rejectUnauthorized: false }, function() {
-    clientConn++;
-    conn.on('error', function(er) {
-      console.error('client error', er);
-      throw er;
-    });
-    conn.end();
-    if (running) makeConnection();
-  });
-}
-
-function done() {
-  running = false;
-  // it's only an established connection if they both saw it.
-  // because we destroy the server somewhat abruptly, these
-  // don't always match.  Generally, serverConn will be
-  // the smaller number, but take the min just to be sure.
-  bench.end(Math.min(serverConn, clientConn));
-}
--- a/benchmark/v8_bench.js
+++ b/benchmark/v8_bench.js
@@ -0,0 +1,15 @@
+// compare with "google-chrome deps/v8/benchmarks/run.html"
+var fs = require('fs');
+var path = require('path');
+var vm = require('vm');
+
+var dir = path.join(__dirname, '..', 'deps', 'v8', 'benchmarks');
+
+global.print = console.log;
+
+global.load = function (x) {
+  var source = fs.readFileSync(path.join(dir, x), 'utf8');
+  vm.runInThisContext(source, x);
+}
+
+load('run.js');
--- a/common.gypi
+++ b/common.gypi
@@ -1,16 +1,14 @@
 {
  'variables': {
-    'werror': '',                     # Turn off -Werror in V8 build.
-    'visibility%': 'hidden',          # V8's visibility setting
-    'target_arch%': 'ia32',           # set v8's target architecture
-    'host_arch%': 'ia32',             # set v8's host architecture
-    'want_separate_host_toolset%': 0, # V8 should not build target and host
-    'library%': 'static_library',     # allow override to 'shared_library' for DLL/.so builds
-    'component%': 'static_library',   # NB. these names match with what V8 expects
-    'msvs_multi_core_compile': '0',   # we do enable multicore compiles, but not using the V8 way
+    'visibility%': 'hidden',         # V8's visibility setting
+    'target_arch%': 'ia32',          # set v8's target architecture
+    'host_arch%': 'ia32',            # set v8's host architecture
+    'want_separate_host_toolset': 0, # V8 should not build target and host
+    'library%': 'static_library',    # allow override to 'shared_library' for DLL/.so builds
+    'component%': 'static_library',  # NB. these names match with what V8 expects
+    'msvs_multi_core_compile': '0',  # we do enable multicore compiles, but not using the V8 way
    'gcc_version%': 'unknown',
    'clang%': 0,
-    'python%': 'python',

    # Turn on optimizations that may trigger compiler bugs.
    # Use at your own risk. Do *NOT* report bugs if this option is enabled.
@@ -20,14 +18,7 @@
    'conditions': [
      ['OS != "win"', {
        'v8_postmortem_support': 'true'
-      }],
-      ['GENERATOR == "ninja" or OS== "mac"', {
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
-        'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
-      }, {
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
-        'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a',
-      }],
+      }]
    ],
  },

@@ -54,9 +45,6 @@
            'LinkIncremental': 2, # enable incremental linking
          },
        },
-        'xcode_settings': {
-          'GCC_OPTIMIZATION_LEVEL': '0', # stop gyp from defaulting to -Os
-        },
      },
      'Release': {
        'conditions': [
@@ -87,12 +75,10 @@
            ],
          }],
          ['OS=="solaris"', {
+            'cflags': [ '-fno-omit-frame-pointer' ],
            # pull in V8's postmortem metadata
            'ldflags': [ '-Wl,-z,allextract' ]
          }],
-          ['OS!="mac" and OS!="win"', {
-            'cflags': [ '-fno-omit-frame-pointer' ],
-          }],
        ],
        'msvs_settings': {
          'VCCLCompilerTool': {
@@ -138,21 +124,8 @@
      },
      'VCLinkerTool': {
        'conditions': [
-          ['target_arch=="ia32"', {
-            'TargetMachine' : 1, # /MACHINE:X86
-            'target_conditions': [
-              ['_type=="executable"', {
-                'AdditionalOptions': [ '/SubSystem:Console,"5.01"' ],
-              }],
-            ],
-          }],
          ['target_arch=="x64"', {
-            'TargetMachine' : 17, # /MACHINE:AMD64
-            'target_conditions': [
-              ['_type=="executable"', {
-                'AdditionalOptions': [ '/SubSystem:Console,"5.02"' ],
-              }],
-            ],
+            'TargetMachine' : 17 # /MACHINE:X64
          }],
        ],
        'GenerateDebugInformation': 'true',
@@ -160,6 +133,11 @@
        'DataExecutionPrevention': 2, # enable DEP
        'AllowIsolation': 'true',
        'SuppressStartupBanner': 'true',
+        'target_conditions': [
+          ['_type=="executable"', {
+            'SubSystem': 1, # console executable
+          }],
+        ],
      },
    },
    'conditions': [
@@ -176,16 +154,16 @@
          'BUILDING_V8_SHARED=1',
          'BUILDING_UV_SHARED=1',
        ],
+      }, {
+        'defines': [
+          '_LARGEFILE_SOURCE',
+          '_FILE_OFFSET_BITS=64',
+        ],
      }],
      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-        'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-pthread', ],
+        'cflags': [ '-Wall', '-pthread', ],
        'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
        'ldflags': [ '-pthread', '-rdynamic' ],
-        'target_conditions': [
-          ['_type=="static_library"', {
-            'standalone_static_library': 1, # disable thin archive which needs binutils >= 2.19
-          }],
-        ],
        'conditions': [
          [ 'target_arch=="ia32"', {
            'cflags': [ '-m32' ],
@@ -214,6 +192,7 @@
          'GCC_ENABLE_CPP_RTTI': 'NO',              # -fno-rtti
          'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
          'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
+          'GCC_VERSION': '4.2',
          'PREBINDING': 'NO',                       # No -Wl,-prebind
          'MACOSX_DEPLOYMENT_TARGET': '10.5',       # -mmacosx-version-min=10.5
          'USE_HEADERMAP': 'NO',
@@ -241,14 +220,6 @@
          }],
        ],
      }],
-      ['OS=="freebsd" and node_use_dtrace=="true"', {
-        'libraries': [ '-lelf' ],
-      }],
-      ['OS=="freebsd"', {
-        'ldflags': [
-          '-Wl,--export-dynamic',
-        ],
-      }]
    ],
  }
 }
--- a/307
+++ b/307
@@ -3,15 +3,13 @@ import optparse
 import os
 import pprint
 import re
-import shlex
 import subprocess
 import sys

 CC = os.environ.get('CC', 'cc')

 root_dir = os.path.dirname(__file__)
-sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))
-from gyp.common import GetFlavor
+sys.path.insert(0, os.path.join(root_dir, 'deps', 'v8', 'tools'))

 # parse our options
 parser = optparse.OptionParser()
@@ -31,6 +29,11 @@ parser.add_option("--without-npm",
    dest="without_npm",
    help="Don\'t install the bundled npm package manager")

+parser.add_option("--without-waf",
+    action="store_true",
+    dest="without_waf",
+    help="Don\'t install node-waf")
+
 parser.add_option("--without-ssl",
    action="store_true",
    dest="without_ssl",
@@ -82,11 +85,6 @@ parser.add_option("--shared-openssl-libname",
    dest="shared_openssl_libname",
    help="Alternative lib name to link to (default: 'crypto,ssl')")

-parser.add_option("--openssl-no-asm",
-    action="store_true",
-    dest="openssl_no_asm",
-    help="Do not build optimized assembly for OpenSSL")
-
 # deprecated
 parser.add_option("--openssl-use-sys",
    action="store_true",
@@ -105,22 +103,10 @@ parser.add_option("--openssl-libpath",
    dest="shared_openssl_libpath",
    help=optparse.SUPPRESS_HELP)

-# TODO document when we've decided on what the tracing API and its options will
-# look like
-parser.add_option("--systemtap-includes",
-    action="store",
-    dest="systemtap_includes",
-    help=optparse.SUPPRESS_HELP)
-
-parser.add_option("--without-ssl2",
+parser.add_option("--no-ssl2",
    action="store_true",
-    dest="ssl2",
-    help="Disable SSL v2")
-
-parser.add_option("--without-ssl3",
-    action="store_true",
-    dest="ssl3",
-    help="Disable SSL v3")
+    dest="no_ssl2",
+    help="Disable OpenSSL v2")

 parser.add_option("--shared-zlib",
    action="store_true",
@@ -142,70 +128,10 @@ parser.add_option("--shared-zlib-libname",
    dest="shared_zlib_libname",
    help="Alternative lib name to link to (default: 'z')")

-parser.add_option("--shared-http-parser",
-    action="store_true",
-    dest="shared_http_parser",
-    help="Link to a shared http_parser DLL instead of static linking")
-
-parser.add_option("--shared-http-parser-includes",
-    action="store",
-    dest="shared_http_parser_includes",
-    help="Directory containing http_parser header files")
-
-parser.add_option("--shared-http-parser-libpath",
-    action="store",
-    dest="shared_http_parser_libpath",
-    help="A directory to search for the shared http_parser DLL")
-
-parser.add_option("--shared-http-parser-libname",
-    action="store",
-    dest="shared_http_parser_libname",
-    help="Alternative lib name to link to (default: 'http_parser')")
-
-parser.add_option("--shared-cares",
-    action="store_true",
-    dest="shared_cares",
-    help="Link to a shared cares DLL instead of static linking")
-
-parser.add_option("--shared-cares-includes",
-    action="store",
-    dest="shared_cares_includes",
-    help="Directory containing cares header files")
-
-parser.add_option("--shared-cares-libpath",
-    action="store",
-    dest="shared_cares_libpath",
-    help="A directory to search for the shared cares DLL")
-
-parser.add_option("--shared-cares-libname",
-    action="store",
-    dest="shared_cares_libname",
-    help="Alternative lib name to link to (default: 'cares')")
-
-parser.add_option("--shared-libuv",
-    action="store_true",
-    dest="shared_libuv",
-    help="Link to a shared libuv DLL instead of static linking")
-
-parser.add_option("--shared-libuv-includes",
-    action="store",
-    dest="shared_libuv_includes",
-    help="Directory containing libuv header files")
-
-parser.add_option("--shared-libuv-libpath",
-    action="store",
-    dest="shared_libuv_libpath",
-    help="A directory to search for the shared libuv DLL")
-
-parser.add_option("--shared-libuv-libname",
-    action="store",
-    dest="shared_libuv_libname",
-    help="Alternative lib name to link to (default: 'uv')")
-
 parser.add_option("--with-dtrace",
    action="store_true",
    dest="with_dtrace",
-    help="Build with DTrace (default is true on sunos)")
+    help="Build with DTrace (default is true on supported systems)")

 parser.add_option("--without-dtrace",
    action="store_true",
@@ -222,16 +148,6 @@ parser.add_option("--without-etw",
    dest="without_etw",
    help="Build without ETW")

-parser.add_option("--with-perfctr",
-    action="store_true",
-    dest="with_perfctr",
-    help="Build with performance counters (default is true on Windows)")
-
-parser.add_option("--without-perfctr",
-    action="store_true",
-    dest="without_perfctr",
-    help="Build without performance counters")
-
 # CHECKME does this still work with recent releases of V8?
 parser.add_option("--gdb",
    action="store_true",
@@ -247,7 +163,7 @@ parser.add_option("--dest-os",
    action="store",
    dest="dest_os",
    help="Operating system to build for. Valid values are: "
-         "win, mac, solaris, freebsd, openbsd, linux")
+         "win, mac, solaris, freebsd, linux")

 parser.add_option("--no-ifaddrs",
    action="store_true",
@@ -260,28 +176,12 @@ parser.add_option("--with-arm-float-abi",
    help="Specifies which floating-point ABI to use. Valid values are: "
         "soft, softfp, hard")

-parser.add_option("--with-mips-float-abi",
-    action="store",
-    dest="mips_float_abi",
-    help="Specifies which floating-point ABI to use. Valid values are: "
-         "soft, hard")
-
-parser.add_option("--ninja",
-    action="store_true",
-    dest="use_ninja",
-    help="Generate files for the ninja build system")
-
 # Using --unsafe-optimizations voids your warranty.
 parser.add_option("--unsafe-optimizations",
    action="store_true",
    dest="unsafe_optimizations",
    help=optparse.SUPPRESS_HELP)

-parser.add_option("--xcode",
-    action="store_true",
-    dest="use_xcode",
-    help="Generate build files for use with xcode")
-
 parser.add_option("--tag",
    action="store",
    dest="tag",
@@ -316,7 +216,7 @@ def cc_macros():
  """Checks predefined macros using the CC command."""

  try:
-    p = subprocess.Popen(shlex.split(CC) + ['-dM', '-E', '-'],
+    p = subprocess.Popen(CC.split() + ['-dM', '-E', '-'],
                         stdin=subprocess.PIPE,
                         stdout=subprocess.PIPE,
                         stderr=subprocess.PIPE)
@@ -336,6 +236,7 @@ def cc_macros():

  k = {}
  for line in out:
+    import shlex
    lst = shlex.split(line)
    if len(lst) > 2:
      key = lst[1]
@@ -353,11 +254,6 @@ def is_arch_armv7():
          '__ARM_ARCH_7M__' in cc_macros_cache)


-def is_arm_neon():
-  """Check for ARM NEON support"""
-  return '__ARM_NEON__' in cc_macros()
-
-
 def arm_hard_float_abi():
  """Check for hardfloat or softfloat eabi on ARM"""
  # GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify
@@ -397,7 +293,6 @@ def host_arch_cc():
    '__x86_64__'  : 'x64',
    '__i386__'    : 'ia32',
    '__arm__'     : 'arm',
-    '__mips__'    : 'mips',
  }

  rtn = 'ia32' # default
@@ -419,7 +314,6 @@ def host_arch_win():
    'AMD64'  : 'x64',
    'x86'    : 'ia32',
    'arm'    : 'arm',
-    'mips'   : 'mips',
  }

  return matchup.get(arch, 'ia32')
@@ -427,13 +321,13 @@ def host_arch_win():

 def compiler_version():
  try:
-    proc = subprocess.Popen(shlex.split(CC) + ['--version'], stdout=subprocess.PIPE)
+    proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
  except WindowsError:
    return (0, False)

  is_clang = 'clang' in proc.communicate()[0].split('\n')[0]

-  proc = subprocess.Popen(shlex.split(CC) + ['-dumpversion'], stdout=subprocess.PIPE)
+  proc = subprocess.Popen(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE)
  version = tuple(map(int, proc.communicate()[0].split('.')))

  return (version, is_clang)
@@ -446,32 +340,22 @@ def configure_arm(o):
    hard_float = options.arm_float_abi == 'hard'
  else:
    hard_float = arm_hard_float_abi()
-
-  armv7 = is_arch_armv7()
-  # CHECKME VFPv3 implies ARMv7+ but is the reverse true as well?
-  fpu = 'vfpv3' if armv7 else 'vfpv2'
-
-  o['variables']['armv7'] = int(armv7)
-  o['variables']['arm_fpu'] = fpu
-  o['variables']['arm_neon'] = int(is_arm_neon())
  o['variables']['v8_use_arm_eabi_hardfloat'] = b(hard_float)

-
-def configure_mips(o):
-  if options.mips_float_abi:
-    if options.mips_float_abi in ('soft', 'hard'):
-      o['variables']['v8_use_mips_abi_hardfloat'] = b(
-          options.mips_float_abi == 'hard')
-    else:
-      raise Exception(
-          'Invalid mips-float-abi value. Valid values are: soft, hard')
+  armv7 = is_arch_armv7()
+  if armv7:
+    # CHECKME VFPv3 implies ARMv7+ but is the reverse true as well?
+    o['variables']['arm_fpu'] = 'vfpv3'
+    o['variables']['arm_neon'] = 0
+  o['variables']['armv7'] = int(armv7)


 def configure_node(o):
-  o['variables']['v8_enable_gdbjit'] = 1 if options.gdb else 0
+  # TODO add gdb
  o['variables']['v8_no_strict_aliasing'] = 1 # work around compiler bugs
  o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
  o['variables']['node_install_npm'] = b(not options.without_npm)
+  o['variables']['node_install_waf'] = b(not options.without_waf)
  o['variables']['node_unsafe_optimizations'] = (
    1 if options.unsafe_optimizations else 0)
  o['default_configuration'] = 'Debug' if options.debug else 'Release'
@@ -481,24 +365,14 @@ def configure_node(o):
  o['variables']['host_arch'] = host_arch
  o['variables']['target_arch'] = target_arch

-  if target_arch != host_arch and not options.without_snapshot:
-    o['variables']['want_separate_host_toolset'] = 1
-  else:
-    o['variables']['want_separate_host_toolset'] = 0
-
  if target_arch == 'arm':
    configure_arm(o)
-  elif target_arch in ('mips', 'mipsel'):
-    configure_mips(o)

  cc_version, is_clang = compiler_version()
  o['variables']['clang'] = 1 if is_clang else 0

  if not is_clang and cc_version != 0:
-    try:
-      o['variables']['gcc_version'] = 10 * cc_version[0] + cc_version[1]
-    except IndexError:
-      o['variables']['gcc_version'] = 10 * cc_version[0]
+    o['variables']['gcc_version'] = 10 * cc_version[0] + cc_version[1]

  # clang has always supported -fvisibility=hidden, right?
  if not is_clang and cc_version < (4,0,0):
@@ -507,41 +381,24 @@ 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 flavor in ('solaris', 'mac'):
+  if sys.platform.startswith('sunos'):
    o['variables']['node_use_dtrace'] = b(not options.without_dtrace)
-  elif flavor == 'freebsd':
-    o['variables']['node_use_dtrace'] = b(options.with_dtrace)
-  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, MacOS or Linux systems.')
+  elif b(options.with_dtrace) == 'true':
+    raise Exception('DTrace is currently only supported on SunOS systems.')
  else:
    o['variables']['node_use_dtrace'] = 'false'
-    o['variables']['node_use_systemtap'] = 'false'

  if options.no_ifaddrs:
    o['defines'] += ['SUNOS_NO_IFADDRS']

  # By default, enable ETW on Windows.
-  if flavor == 'win':
+  if sys.platform.startswith('win32'):
    o['variables']['node_use_etw'] = b(not options.without_etw);
-  elif options.with_etw:
+  elif b(options.with_etw) == 'true':
    raise Exception('ETW is only supported on Windows.')
  else:
    o['variables']['node_use_etw'] = 'false'

-  # By default, enable Performance counters on Windows.
-  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.')
-  else:
-    o['variables']['node_use_perfctr'] = 'false'
-
  if options.tag:
    o['variables']['node_tag'] = '-' + options.tag
  else:
@@ -562,48 +419,6 @@ def configure_libz(o):
    o['include_dirs'] += [options.shared_zlib_includes]


-def configure_http_parser(o):
-    o['variables']['node_shared_http_parser'] = b(options.shared_http_parser)
-
-    # assume shared http_parser if one of these is set?
-    if options.shared_http_parser_libpath:
-        o['libraries'] += ['-L%s' % options.shared_http_parser_libpath]
-    if options.shared_http_parser_libname:
-        o['libraries'] += ['-l%s' % options.shared_http_parser_libname]
-    elif options.shared_http_parser:
-        o['libraries'] += ['-lhttp_parser']
-    if options.shared_http_parser_includes:
-        o['include_dirs'] += [options.shared_http_parser_includes]
-
-
-def configure_cares(o):
-    o['variables']['node_shared_cares'] = b(options.shared_cares)
-
-    # assume shared cares if one of these is set?
-    if options.shared_cares_libpath:
-        o['libraries'] += ['-L%s' % options.shared_cares_libpath]
-    if options.shared_cares_libname:
-        o['libraries'] += ['-l%s' % options.shared_cares_libname]
-    elif options.shared_cares:
-        o['libraries'] += ['-lcares']
-    if options.shared_cares_includes:
-        o['include_dirs'] += [options.shared_cares_includes]
-
-
-def configure_libuv(o):
-  o['variables']['node_shared_libuv'] = b(options.shared_libuv)
-
-  # assume shared libuv if one of these is set?
-  if options.shared_libuv_libpath:
-    o['libraries'] += ['-L%s' % options.shared_libuv_libpath]
-  if options.shared_libuv_libname:
-    o['libraries'] += ['-l%s' % options.shared_libuv_libname]
-  elif options.shared_libuv:
-    o['libraries'] += ['-luv']
-  if options.shared_libuv_includes:
-    o['include_dirs'] += [options.shared_libuv_includes]
-
-
 def configure_v8(o):
  o['variables']['v8_use_snapshot'] = b(not options.without_snapshot)
  o['variables']['node_shared_v8'] = b(options.shared_v8)
@@ -622,18 +437,13 @@ def configure_v8(o):
 def configure_openssl(o):
  o['variables']['node_use_openssl'] = b(not options.without_ssl)
  o['variables']['node_shared_openssl'] = b(options.shared_openssl)
-  o['variables']['openssl_no_asm'] = (
-    1 if options.openssl_no_asm else 0)

  if options.without_ssl:
    return

-  if options.ssl2:
+  if options.no_ssl2:
    o['defines'] += ['OPENSSL_NO_SSL2=1']

-  if options.ssl3:
-    o['defines'] += ['OPENSSL_NO_SSL3=1']
-
  if options.shared_openssl:
    (libs, cflags) = pkg_config('openssl') or ('-lssl -lcrypto', '')

@@ -652,29 +462,8 @@ def configure_openssl(o):
      o['cflags'] += cflags.split()


-def configure_winsdk(o):
-  if flavor != 'win':
-    return
-
-  winsdk_dir = os.environ.get("WindowsSdkDir")
-
-  if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'):
-    print "Found ctrpp in WinSDK--will build generated files into tools/msvs/genfiles."
-    o['variables']['node_has_winsdk'] = 'true'
-    return
-
-  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 },
+  'variables': {},
  'include_dirs': [],
  'libraries': [],
  'defines': [],
@@ -683,12 +472,8 @@ output = {

 configure_node(output)
 configure_libz(output)
-configure_http_parser(output)
-configure_cares(output)
-configure_libuv(output)
 configure_v8(output)
 configure_openssl(output)
-configure_winsdk(output)

 # variables should be a root level element,
 # move everything else to target_defaults
@@ -709,28 +494,14 @@ def write(filename, data):
 write('config.gypi', "# Do not edit. Generated by the configure script.\n" +
  pprint.pformat(output, indent=2) + "\n")

-config = {
-  'BUILDTYPE': 'Debug' if options.debug else 'Release',
-  'USE_NINJA': str(int(options.use_ninja or 0)),
-  'USE_XCODE': str(int(options.use_xcode or 0)),
-  'PYTHON': sys.executable,
-}
-config = '\n'.join(map('='.join, config.iteritems())) + '\n'
+write('config.mk', "# Do not edit. Generated by the configure script.\n" +
+  ("BUILDTYPE=%s\n" % ('Debug' if options.debug else 'Release')))

-write('config.mk',
-      '# Do not edit. Generated by the configure script.\n' + config)
-
-gyp_args = [sys.executable, 'tools/gyp_node.py', '--no-parallel']
-
-if options.use_ninja:
-  gyp_args += ['-f', 'ninja-' + flavor]
-elif options.use_xcode:
-  gyp_args += ['-f', 'xcode']
-elif flavor == 'win':
-  gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']
+if os.name == 'nt':
+  gyp_args = ['-f', 'msvs', '-G', 'msvs_version=2010']
+elif options.dest_os:
+  gyp_args = ['-f', 'make-' + options.dest_os]
 else:
-  gyp_args += ['-f', 'make-' + flavor]
+  gyp_args = ['-f', 'make']

-gyp_args += args
-
-sys.exit(subprocess.call(gyp_args))
+subprocess.call([sys.executable, 'tools/gyp_node'] + gyp_args)
--- a/deps/cares/.gitignore
+++ b/deps/cares/.gitignore
@@ -1,15 +0,0 @@
-/Debug/
-/out/
-/Release/
-
-/cares.Makefile
-/cares.target.mk
-/Makefile
-
-/*.opensdf
-/*.sdf
-/*.sln
-/*.suo
-/*.vcxproj
-/*.vcxproj.filters
-/*.vcxproj.user
--- a/deps/cares/build/gcc_version.py
+++ b/deps/cares/build/gcc_version.py
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import re
-import subprocess
-import sys
-
-
-def DoMain(*args):
-  cc = os.environ.get('CC', 'gcc')
-  stdin, stderr = os.pipe()
-  subprocess.call([cc, '-v'], stderr=stderr)
-  output = os.read(stdin, 4096)
-  match = re.search("\ngcc version (\d+\.\d+\.\d+)", output)
-  if match:
-    print(match.group(1))
-
-
-if __name__ == '__main__':
-  DoMain(*sys.argv)
--- a/deps/cares/cares.gyp
+++ b/deps/cares/cares.gyp
@@ -1,160 +0,0 @@
-{
-  'target_defaults': {
-    'conditions': [
-      ['OS!="win"', {
-        'defines': [
-          '_DARWIN_USE_64_BIT_INODE=1',
-          '_LARGEFILE_SOURCE',
-          '_FILE_OFFSET_BITS=64',
-          '_GNU_SOURCE'
-        ]
-      }],
-      ['OS=="solaris"', {
-        'defines': [
-          '__EXTENSIONS__',
-          '_XOPEN_SOURCE=500'
-        ]
-      }]
-    ]
-  },
-
-  'targets': [
-    {
-      'target_name': 'cares',
-      'type': '<(library)',
-      'include_dirs': [ 'include', 'src' ],
-      'direct_dependent_settings': {
-        'include_dirs': [ 'include' ]
-      },
-      'defines': [ 'HAVE_CONFIG_H' ],
-      'sources': [
-        'common.gypi',
-        'include/ares.h',
-        'include/ares_version.h',
-        'include/nameser.h',
-        'src/ares_cancel.c',
-        'src/ares__close_sockets.c',
-        'src/ares_data.c',
-        'src/ares_data.h',
-        'src/ares_destroy.c',
-        'src/ares_dns.h',
-        'src/ares_expand_name.c',
-        'src/ares_expand_string.c',
-        'src/ares_fds.c',
-        'src/ares_free_hostent.c',
-        'src/ares_free_string.c',
-        'src/ares_getenv.h',
-        'src/ares_gethostbyaddr.c',
-        'src/ares_gethostbyname.c',
-        'src/ares__get_hostent.c',
-        'src/ares_getnameinfo.c',
-        'src/ares_getopt.c',
-        'src/ares_getopt.h',
-        'src/ares_getsock.c',
-        'src/ares_init.c',
-        'src/ares_ipv6.h',
-        'src/ares_library_init.c',
-        'src/ares_library_init.h',
-        'src/ares_llist.c',
-        'src/ares_llist.h',
-        'src/ares_mkquery.c',
-        'src/ares_nowarn.c',
-        'src/ares_nowarn.h',
-        'src/ares_options.c',
-        'src/ares_parse_aaaa_reply.c',
-        'src/ares_parse_a_reply.c',
-        'src/ares_parse_mx_reply.c',
-        'src/ares_parse_naptr_reply.c',
-        'src/ares_parse_ns_reply.c',
-        'src/ares_parse_ptr_reply.c',
-        'src/ares_parse_soa_reply.c',
-        'src/ares_parse_srv_reply.c',
-        'src/ares_parse_txt_reply.c',
-        'src/ares_platform.h',
-        'src/ares_private.h',
-        'src/ares_process.c',
-        'src/ares_query.c',
-        'src/ares__read_line.c',
-        'src/ares_rules.h',
-        'src/ares_search.c',
-        'src/ares_send.c',
-        'src/ares_setup.h',
-        'src/ares_strcasecmp.c',
-        'src/ares_strcasecmp.h',
-        'src/ares_strdup.c',
-        'src/ares_strdup.h',
-        'src/ares_strerror.c',
-        'src/ares_timeout.c',
-        'src/ares__timeval.c',
-        'src/ares_version.c',
-        'src/ares_writev.c',
-        'src/ares_writev.h',
-        'src/bitncmp.c',
-        'src/bitncmp.h',
-        'src/inet_net_pton.c',
-        'src/inet_net_pton.h',
-        'src/inet_ntop.c',
-        'src/inet_ntop.h',
-        'src/setup_once.h',
-        'src/windows_port.c'
-      ],
-      'conditions': [
-        [ 'library=="static_library"', {
-          'defines': [ 'CARES_STATICLIB' ]
-        }, {
-          'defines': [ 'CARES_BUILDING_LIBRARY' ]
-        }],
-        [ 'OS=="win"', {
-          'include_dirs': [ 'config/win32' ],
-          'sources': [
-            'config/win32/ares_config.h',
-            'src/windows_port.c',
-            'src/ares_getenv.c',
-            'src/ares_iphlpapi.h',
-            'src/ares_platform.c'
-          ],
-          'libraries': [
-            '-lws2_32.lib',
-            '-liphlpapi.lib'
-          ],
-        }, {
-          # Not Windows i.e. POSIX
-          'cflags': [
-            '-g',
-            '--std=gnu89',
-            '-pedantic',
-            '-Wall',
-            '-Wextra',
-            '-Wno-unused-parameter'
-          ],
-        }],
-        [ 'OS=="linux"', {
-          'include_dirs': [ 'config/linux' ],
-          'sources': [ 'config/linux/ares_config.h' ]
-        }],
-        [ 'OS=="mac"', {
-          'include_dirs': [ 'config/darwin' ],
-          'sources': [ 'config/darwin/ares_config.h' ]
-        }],
-        [ 'OS=="freebsd" or OS=="dragonflybsd"', {
-          'include_dirs': [ 'config/freebsd' ],
-          'sources': [ 'config/freebsd/ares_config.h' ]
-        }],
-        [ 'OS=="openbsd"', {
-          'include_dirs': [ 'config/openbsd' ],
-          'sources': [ 'config/openbsd/ares_config.h' ]
-        }],
-        [ 'OS=="solaris"', {
-          'include_dirs': [ 'config/sunos' ],
-          'sources': [ 'config/sunos/ares_config.h' ],
-          'direct_dependent_settings': {
-            'libraries': [
-              '-lsocket',
-              '-lnsl'
-            ]
-          }
-        }]
-      ]
-    }
-  ]
-}
--- a/deps/cares/common.gypi
+++ b/deps/cares/common.gypi
@@ -1,172 +0,0 @@
-{
-  'variables': {
-    'visibility%': 'hidden',
-    'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
-    'component%': 'static_library',
-    'host_arch%': '',
-    'target_arch%': ''
-   },
-
-  'target_defaults': {
-    'default_configuration': 'Debug',
-    'configurations': {
-
-      'Debug': {
-        'defines': [ 'DEBUG', '_DEBUG' ],
-        'cflags': [ '-g', '-O0' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'target_conditions': [
-              ['library=="static_library"', {
-                'RuntimeLibrary': 1 # static debug
-              }, {
-                'RuntimeLibrary': 3 # DLL debug
-              }]
-            ],
-            'Optimization': 0, # /Od, no optimization
-            'MinimalRebuild': 'false',
-            'OmitFramePointers': 'false',
-            'BasicRuntimeChecks': 3 # /RTC1
-          },
-          'VCLinkerTool': {
-            'LinkIncremental': 2 # enable incremental linking
-          }
-        },
-        'xcode_settings': {
-          'GCC_OPTIMIZATION_LEVEL': '0'
-        }
-      },
-
-      'Release': {
-        'defines': [ 'NDEBUG' ],
-        'cflags': [
-          '-O3',
-          '-fomit-frame-pointer',
-          '-fdata-sections',
-          '-ffunction-sections'
-        ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'target_conditions': [
-              ['library=="static_library"', {
-                'RuntimeLibrary': 0, # static release
-              }, {
-                'RuntimeLibrary': 2, # debug release
-              }],
-            ],
-            'Optimization': 3, # /Ox, full optimization
-            'FavorSizeOrSpeed': 1, # /Ot, favour speed over size
-            'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible
-            'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG
-            'OmitFramePointers': 'true',
-            'EnableFunctionLevelLinking': 'true',
-            'EnableIntrinsicFunctions': 'true'
-          },
-          'VCLibrarianTool': {
-            'AdditionalOptions': [
-              '/LTCG' # link time code generation
-            ]
-          },
-          'VCLinkerTool': {
-            'LinkTimeCodeGeneration': 1, # link-time code generation
-            'OptimizeReferences': 2, # /OPT:REF
-            'EnableCOMDATFolding': 2, # /OPT:ICF
-            'LinkIncremental': 1 # disable incremental linking
-          },
-        },
-      }
-    },
-
-    'msvs_settings': {
-      'VCCLCompilerTool': {
-        'StringPooling': 'true', # pool string literals
-        'DebugInformationFormat': 3, # Generate a PDB
-        'WarningLevel': 3,
-        'BufferSecurityCheck': 'true',
-        'ExceptionHandling': 1, # /EHsc
-        'SuppressStartupBanner': 'true',
-        'WarnAsError': 'false',
-        'AdditionalOptions': [
-           '/MP', # compile across multiple CPUs
-         ],
-      },
-      'VCLinkerTool': {
-        'GenerateDebugInformation': 'true',
-        'RandomizedBaseAddress': 2, # enable ASLR
-        'DataExecutionPrevention': 2, # enable DEP
-        'AllowIsolation': 'true',
-        'SuppressStartupBanner': 'true',
-        'target_conditions': [
-          ['_type=="executable"', {
-            'SubSystem': 1, # console executable
-          }],
-        ],
-      },
-    },
-
-    'xcode_settings': {
-      'ALWAYS_SEARCH_USER_PATHS': 'NO',
-      'GCC_CW_ASM_SYNTAX': 'NO',                # No -fasm-blocks
-      'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',        # -fno-exceptions
-      'GCC_ENABLE_CPP_RTTI': 'NO',              # -fno-rtti
-      'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
-      # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
-      'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
-      'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
-      'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
-      'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
-      'PREBINDING': 'NO',                       # No -Wl,-prebind
-      'USE_HEADERMAP': 'NO',
-      'WARNING_CFLAGS': [
-        '-Wall',
-        '-Wendif-labels',
-        '-W',
-        '-Wno-unused-parameter'
-      ]
-    },
-
-    'conditions': [
-      ['OS == "win"', {
-        'msvs_cygwin_shell': 0, # prevent actions from trying to use cygwin
-        'defines': [
-          'WIN32',
-          # we don't want VC++ warning us about how dangerous C functions are.
-          '_CRT_SECURE_NO_DEPRECATE',
-          # ... or that C implementations shouldn't use POSIX names
-          '_CRT_NONSTDC_NO_DEPRECATE'
-        ],
-      }],
-
-      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-        'variables': {
-          'gcc_version%': '<!(python build/gcc_version.py)>)'
-        },
-        'cflags': [ '-Wall' ],
-        'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
-        'conditions': [
-          [ 'host_arch != target_arch and target_arch=="ia32"', {
-            'cflags': [ '-m32' ],
-            'ldflags': [ '-m32' ]
-          }],
-          [ 'OS=="linux"', {
-            'cflags': [ '-ansi' ]
-          }],
-          [ 'visibility=="hidden" and gcc_version >= "4.0.0"', {
-            'cflags': [ '-fvisibility=hidden' ]
-          }],
-        ]
-      }]
-    ],
-
-    'target_conditions': [
-      ['_type!="static_library"', {
-        'cflags': [ '-fPIC' ],
-        'xcode_settings': {
-          'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic
-                                      # (Equivalent to -fPIC)
-          'OTHER_LDFLAGS': [ '-Wl,-search_paths_first' ]
-        }
-      }]
-    ]
-  }
-}
--- a/deps/cares/src/CHANGES
+++ b/deps/cares/src/CHANGES
@@ -1,7 +0,0 @@
-This file no longer holds the changelog. Now you can generate it yourself
-like this:
-
- $ git log --pretty=fuller --no-color --date=short --decorate=full -1000 |
-   ./git2changes.pl
-
-The older, manually edited, changelog is found in git named CHANGES.0
--- a/deps/cares/src/RELEASE-NOTES
+++ b/deps/cares/src/RELEASE-NOTES
@@ -1,16 +0,0 @@
-c-ares version 1.9.0
-
-Changed:
-
- o Added ares_parse_soa_reply
-
-Fixed:
-
- o libcares.pc generation for static MingW* cross builds
- o ares_dup: UDP and TCP port byte order in saved options
- 
-Thanks go to these friendly people for their efforts and contributions:
-
- Yang Tse, Nick Alcock, Marko Kreen
-
-Have fun!
--- a/deps/cares/src/ares_init.c
+++ b/deps/cares/src/ares_init.c
--- a/deps/cares/src/ares_nowarn.c
+++ b/deps/cares/src/ares_nowarn.c
@@ -1,249 +0,0 @@
-
-/* Copyright (C) 2010-2012 by Daniel Stenberg
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-
-#include "ares_setup.h"
-
-#ifdef HAVE_ASSERT_H
-#  include <assert.h>
-#endif
-
-#if defined(__INTEL_COMPILER) && defined(__unix__)
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif
-
-#endif /* __INTEL_COMPILER && __unix__ */
-
-#define BUILDING_ARES_NOWARN_C 1
-
-#include "ares_nowarn.h"
-
-#define CARES_MASK_USHORT (~(unsigned short) 0)
-#define CARES_MASK_UINT   (~(unsigned int) 0)
-#define CARES_MASK_ULONG  (~(unsigned long) 0)
-
-#define CARES_MASK_SSHORT (CARES_MASK_USHORT >> 1)
-#define CARES_MASK_SINT   (CARES_MASK_UINT >> 1)
-#define CARES_MASK_SLONG  (CARES_MASK_ULONG >> 1)
-
-/*
-** unsigned size_t to signed long
-*/
-
-long aresx_uztosl(size_t uznum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  return (long)(uznum & (size_t) CARES_MASK_SLONG);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** unsigned size_t to signed int
-*/
-
-int aresx_uztosi(size_t uznum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  return (int)(uznum & (size_t) CARES_MASK_SINT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** unsigned size_t to signed short
-*/
-
-short aresx_uztoss(size_t uznum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  return (short)(uznum & (size_t) CARES_MASK_SSHORT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** signed int to signed short
-*/
-
-short aresx_sitoss(int sinum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  DEBUGASSERT(sinum >= 0);
-  return (short)(sinum & (int) CARES_MASK_SSHORT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** signed long to signed int
-*/
-
-int aresx_sltosi(long slnum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  DEBUGASSERT(slnum >= 0);
-  return (int)(slnum & (long) CARES_MASK_SINT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** signed ssize_t to signed int
-*/
-
-int aresx_sztosi(ssize_t sznum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  DEBUGASSERT(sznum >= 0);
-  return (int)(sznum & (ssize_t) CARES_MASK_SINT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** signed ssize_t to unsigned int
-*/
-
-unsigned int aresx_sztoui(ssize_t sznum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  DEBUGASSERT(sznum >= 0);
-  return (unsigned int)(sznum & (ssize_t) CARES_MASK_UINT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** signed int to unsigned short
-*/
-
-unsigned short aresx_sitous(int sinum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  DEBUGASSERT(sinum >= 0);
-  return (unsigned short)(sinum & (int) CARES_MASK_USHORT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-#if defined(__INTEL_COMPILER) && defined(__unix__)
-
-int aresx_FD_ISSET(int fd, fd_set *fdset)
-{
-  #pragma warning(push)
-  #pragma warning(disable:1469) /* clobber ignored */
-  return FD_ISSET(fd, fdset);
-  #pragma warning(pop)
-}
-
-void aresx_FD_SET(int fd, fd_set *fdset)
-{
-  #pragma warning(push)
-  #pragma warning(disable:1469) /* clobber ignored */
-  FD_SET(fd, fdset);
-  #pragma warning(pop)
-}
-
-void aresx_FD_ZERO(fd_set *fdset)
-{
-  #pragma warning(push)
-  #pragma warning(disable:593) /* variable was set but never used */
-  FD_ZERO(fdset);
-  #pragma warning(pop)
-}
-
-unsigned short aresx_htons(unsigned short usnum)
-{
-#if (__INTEL_COMPILER == 910) && defined(__i386__)
-  return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF));
-#else
-  #pragma warning(push)
-  #pragma warning(disable:810) /* conversion may lose significant bits */
-  return htons(usnum);
-  #pragma warning(pop)
-#endif
-}
-
-unsigned short aresx_ntohs(unsigned short usnum)
-{
-#if (__INTEL_COMPILER == 910) && defined(__i386__)
-  return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF));
-#else
-  #pragma warning(push)
-  #pragma warning(disable:810) /* conversion may lose significant bits */
-  return ntohs(usnum);
-  #pragma warning(pop)
-#endif
-}
-
-#endif /* __INTEL_COMPILER && __unix__ */
--- a/deps/cares/src/ares_parse_naptr_reply.c
+++ b/deps/cares/src/ares_parse_naptr_reply.c
@@ -1,188 +0,0 @@
-
-/* Copyright 1998 by the Massachusetts Institute of Technology.
- * Copyright (C) 2009 by Jakub Hrozek <jhrozek@redhat.com>
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-#include "ares_setup.h"
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#  include <arpa/nameser.h>
-#else
-#  include "nameser.h"
-#endif
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#  include <arpa/nameser_compat.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include "ares.h"
-#include "ares_dns.h"
-#include "ares_data.h"
-#include "ares_private.h"
-
-/* AIX portability check */
-#ifndef T_NAPTR
-	#define T_NAPTR 35 /* naming authority pointer */
-#endif
-
-int
-ares_parse_naptr_reply (const unsigned char *abuf, int alen,
-                        struct ares_naptr_reply **naptr_out)
-{
-  unsigned int qdcount, ancount, i;
-  const unsigned char *aptr, *vptr;
-  int status, rr_type, rr_class, rr_len;
-  long len;
-  char *hostname = NULL, *rr_name = NULL;
-  struct ares_naptr_reply *naptr_head = NULL;
-  struct ares_naptr_reply *naptr_last = NULL;
-  struct ares_naptr_reply *naptr_curr;
-
-  /* Set *naptr_out to NULL for all failure cases. */
-  *naptr_out = NULL;
-
-  /* Give up if abuf doesn't have room for a header. */
-  if (alen < HFIXEDSZ)
-    return ARES_EBADRESP;
-
-  /* Fetch the question and answer count from the header. */
-  qdcount = DNS_HEADER_QDCOUNT (abuf);
-  ancount = DNS_HEADER_ANCOUNT (abuf);
-  if (qdcount != 1)
-    return ARES_EBADRESP;
-  if (ancount == 0)
-    return ARES_ENODATA;
-
-  /* Expand the name from the question, and skip past the question. */
-  aptr = abuf + HFIXEDSZ;
-  status = ares_expand_name (aptr, abuf, alen, &hostname, &len);
-  if (status != ARES_SUCCESS)
-    return status;
-
-  if (aptr + len + QFIXEDSZ > abuf + alen)
-    {
-      free (hostname);
-      return ARES_EBADRESP;
-    }
-  aptr += len + QFIXEDSZ;
-
-  /* Examine each answer resource record (RR) in turn. */
-  for (i = 0; i < ancount; i++)
-    {
-      /* Decode the RR up to the data field. */
-      status = ares_expand_name (aptr, abuf, alen, &rr_name, &len);
-      if (status != ARES_SUCCESS)
-        {
-          break;
-        }
-      aptr += len;
-      if (aptr + RRFIXEDSZ > abuf + alen)
-        {
-          status = ARES_EBADRESP;
-          break;
-        }
-      rr_type = DNS_RR_TYPE (aptr);
-      rr_class = DNS_RR_CLASS (aptr);
-      rr_len = DNS_RR_LEN (aptr);
-      aptr += RRFIXEDSZ;
-
-      /* Check if we are really looking at a NAPTR record */
-      if (rr_class == C_IN && rr_type == T_NAPTR)
-        {
-          /* parse the NAPTR record itself */
-
-          /* Allocate storage for this NAPTR answer appending it to the list */
-          naptr_curr = ares_malloc_data(ARES_DATATYPE_NAPTR_REPLY);
-          if (!naptr_curr)
-            {
-              status = ARES_ENOMEM;
-              break;
-            }
-          if (naptr_last)
-            {
-              naptr_last->next = naptr_curr;
-            }
-          else
-            {
-              naptr_head = naptr_curr;
-            }
-          naptr_last = naptr_curr;
-
-          vptr = aptr;
-          naptr_curr->order = DNS__16BIT(vptr);
-          vptr += sizeof(unsigned short);
-          naptr_curr->preference = DNS__16BIT(vptr);
-          vptr += sizeof(unsigned short);
-
-          status = ares_expand_string(vptr, abuf, alen, &naptr_curr->flags, &len);
-          if (status != ARES_SUCCESS)
-            break;
-          vptr += len;
-
-          status = ares_expand_string(vptr, abuf, alen, &naptr_curr->service, &len);
-          if (status != ARES_SUCCESS)
-            break;
-          vptr += len;
-
-          status = ares_expand_string(vptr, abuf, alen, &naptr_curr->regexp, &len);
-          if (status != ARES_SUCCESS)
-            break;
-          vptr += len;
-
-          status = ares_expand_name(vptr, abuf, alen, &naptr_curr->replacement, &len);
-          if (status != ARES_SUCCESS)
-            break;
-        }
-
-      /* Don't lose memory in the next iteration */
-      free (rr_name);
-      rr_name = NULL;
-
-      /* Move on to the next record */
-      aptr += rr_len;
-    }
-
-  if (hostname)
-    free (hostname);
-  if (rr_name)
-    free (rr_name);
-
-  /* clean up on error */
-  if (status != ARES_SUCCESS)
-    {
-      if (naptr_head)
-        ares_free_data (naptr_head);
-      return status;
-    }
-
-  /* everything looks fine, return the data */
-  *naptr_out = naptr_head;
-
-  return ARES_SUCCESS;
-}
-
--- a/deps/cares/src/ares_parse_soa_reply.c
+++ b/deps/cares/src/ares_parse_soa_reply.c
@@ -1,135 +0,0 @@
-
-/* Copyright 1998 by the Massachusetts Institute of Technology.
- * Copyright (C) 2012 Marko Kreen <markokr@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-#include "ares_setup.h"
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-#  include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#  include <arpa/nameser.h>
-#else
-#  include "nameser.h"
-#endif
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#  include <arpa/nameser_compat.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include "ares.h"
-#include "ares_dns.h"
-#include "ares_data.h"
-#include "ares_private.h"
-
-int
-ares_parse_soa_reply(const unsigned char *abuf, int alen,
-		     struct ares_soa_reply **soa_out)
-{
-  const unsigned char *aptr;
-  long len;
-  char *qname = NULL, *rr_name = NULL;
-  struct ares_soa_reply *soa = NULL;
-  int qdcount, ancount;
-  int status;
-
-  if (alen < HFIXEDSZ)
-    return ARES_EBADRESP;
-
-  /* parse message header */
-  qdcount = DNS_HEADER_QDCOUNT(abuf);
-  ancount = DNS_HEADER_ANCOUNT(abuf);
-  if (qdcount != 1 || ancount != 1)
-    return ARES_EBADRESP;
-  aptr = abuf + HFIXEDSZ;
-
-  /* query name */
-  status = ares__expand_name_for_response(aptr, abuf, alen, &qname, &len);
-  if (status != ARES_SUCCESS)
-    goto failed_stat;
-  aptr += len;
-
-  /* skip qtype & qclass */
-  if (aptr + QFIXEDSZ > abuf + alen)
-    goto failed;
-  aptr += QFIXEDSZ;
-
-  /* rr_name */
-  status = ares__expand_name_for_response(aptr, abuf, alen, &rr_name, &len);
-  if (status != ARES_SUCCESS)
-    goto failed_stat;
-  aptr += len;
-
-  /* skip rr_type, rr_class, rr_ttl, rr_rdlen */
-  if (aptr + RRFIXEDSZ > abuf + alen)
-    goto failed;
-  aptr += RRFIXEDSZ;
-
-  /* allocate result struct */
-  soa = ares_malloc_data(ARES_DATATYPE_SOA_REPLY);
-  if (!soa)
-    return ARES_ENOMEM;
-
-  /* nsname */
-  status = ares__expand_name_for_response(aptr, abuf, alen, &soa->nsname, &len);
-  if (status != ARES_SUCCESS)
-    goto failed_stat;
-  aptr += len;
-
-  /* hostmaster */
-  status = ares__expand_name_for_response(aptr, abuf, alen, &soa->hostmaster, &len);
-  if (status != ARES_SUCCESS)
-    goto failed_stat;
-  aptr += len;
-
-  /* integer fields */
-  if (aptr + 5 * 4 > abuf + alen)
-    goto failed;
-  soa->serial = DNS__32BIT(aptr + 0 * 4);
-  soa->refresh = DNS__32BIT(aptr + 1 * 4);
-  soa->retry = DNS__32BIT(aptr + 2 * 4);
-  soa->expire = DNS__32BIT(aptr + 3 * 4);
-  soa->minttl = DNS__32BIT(aptr + 4 * 4);
-
-  free(qname);
-  free(rr_name);
-
-  *soa_out = soa;
-
-  return ARES_SUCCESS;
-
-failed:
-  status = ARES_EBADRESP;
-
-failed_stat:
-  ares_free_data(soa);
-  if (qname)
-    free(qname);
-  if (rr_name)
-    free(rr_name);
-  return status;
-}
-
--- a/deps/http_parser/.gitignore
+++ b/deps/http_parser/.gitignore
@@ -4,8 +4,5 @@ tags
 test
 test_g
 test_fast
-url_parser
 *.mk
 *.Makefile
-*.so
-*.a
--- a/deps/http_parser/.mailmap
+++ b/deps/http_parser/.mailmap
@@ -2,4 +2,3 @@
 #   git log --all --reverse --format='%aN <%aE>' | perl -ne 'BEGIN{print "# Authors ordered by first contribution.\n"} print unless $h{$_}; $h{$_} = 1' > AUTHORS
 Ryan Dahl <ry@tinyclouds.org>
 Salman Haq <salman.haq@asti-usa.com>
-Simon Zimmermann <simonz05@gmail.com>
--- a/deps/http_parser/AUTHORS
+++ b/deps/http_parser/AUTHORS
@@ -30,8 +30,3 @@ James McLaughlin <jamie@lacewing-project.org>
 David Gwynne <loki@animata.net>
 LE ROUX Thomas <thomas@procheo.fr>
 Randy Rizun <rrizun@ortivawireless.com>
-Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
-Simon Zimmermann <simonz05@gmail.com>
-Erik Dubbelboer <erik@dubbelboer.com>
-Martell Malone <martellmalone@gmail.com>
-Bertrand Paquet <bpaquet@octo.com>
--- a/deps/http_parser/Makefile
+++ b/deps/http_parser/Makefile
@@ -31,12 +31,6 @@ test_fast: http_parser.o test.o http_parser.h
 test.o: test.c http_parser.h Makefile
 	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c test.c -o $@

-url_parser: http_parser_g.o url_parser.o
-	$(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o url_parser.o -o $@
-
-url_parser.o: url_parser.c http_parser.h Makefile
-	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c url_parser.c -o $@
-
 http_parser.o: http_parser.c http_parser.h Makefile
 	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c

@@ -59,6 +53,6 @@ tags: http_parser.c http_parser.h test.c
 	ctags $^

 clean:
-	rm -f *.o *.a test test_fast test_g url_parser http_parser.tar tags libhttp_parser.so libhttp_parser.o
+	rm -f *.o *.a test test_fast test_g http_parser.tar tags libhttp_parser.so libhttp_parser.o

 .PHONY: clean package test-run test-run-timed test-valgrind
--- a/deps/http_parser/http_parser.c
+++ b/deps/http_parser/http_parser.c
@@ -37,19 +37,6 @@
 # define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif

-#ifndef ARRAY_SIZE
-# define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-#ifndef BIT_AT
-# define BIT_AT(a, i)                                                \
-  (!!((unsigned int) (a)[(unsigned int) (i) >> 3] &                  \
-   (1 << ((unsigned int) (i) & 7))))
-#endif
-
-#ifndef ELEM_AT
-# define ELEM_AT(a, i, v) ((unsigned int) (i) < ARRAY_SIZE(a) ? (a)[(i)] : (v))
-#endif

 #if HTTP_PARSER_DEBUG
 #define SET_ERRNO(e)                                                 \
@@ -197,48 +184,40 @@ static const int8_t unhex[256] =
  };


-#if HTTP_PARSER_STRICT
-# define T(v) 0
-#else
-# define T(v) v
-#endif
-
-
-static const uint8_t normal_url_char[32] = {
+static const uint8_t normal_url_char[256] = {
 /*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+        0,       0,       0,       0,       0,       0,       0,       0,
 /*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
-        0    | T(2)   |   0    |   0    | T(16)  |   0    |   0    |   0,
+        0,       0,       0,       0,       0,       0,       0,       0,
 /*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+        0,       0,       0,       0,       0,       0,       0,       0,
 /*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
-        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+        0,       0,       0,       0,       0,       0,       0,       0,
 /*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
-        0    |   2    |   4    |   0    |   16   |   32   |   64   |  128,
+        0,       1,       1,       0,       1,       1,       1,       1,
 /*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0,
+        1,       1,       1,       1,       1,       1,       1,       0,
 /*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+        1,       1,       1,       1,       1,       1,       1,       1,
 /* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
-        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0, };
+        1,       1,       1,       1,       1,       1,       1,       0, };

-#undef T

 enum state
  { s_dead = 1 /* important that this is > 0 */
@@ -266,9 +245,13 @@ enum state
  , s_req_schema
  , s_req_schema_slash
  , s_req_schema_slash_slash
-  , s_req_server_start
-  , s_req_server
-  , s_req_server_with_at
+  , s_req_host_start
+  , s_req_host_v6_start
+  , s_req_host_v6
+  , s_req_host_v6_end
+  , s_req_host
+  , s_req_port_start
+  , s_req_port
  , s_req_path
  , s_req_query_string_start
  , s_req_query_string
@@ -346,19 +329,6 @@ enum header_states
  , h_connection_close
  };

-enum http_host_state
-  {
-    s_http_host_dead = 1
-  , s_http_userinfo_start
-  , s_http_userinfo
-  , s_http_host_start
-  , s_http_host_v6_start
-  , s_http_host
-  , s_http_host_v6
-  , s_http_host_v6_end
-  , s_http_host_port_start
-  , s_http_host_port
-};

 /* Macros for character classes; depends on strict-mode  */
 #define CR                  '\r'
@@ -368,21 +338,15 @@ enum http_host_state
 #define IS_NUM(c)           ((c) >= '0' && (c) <= '9')
 #define IS_ALPHANUM(c)      (IS_ALPHA(c) || IS_NUM(c))
 #define IS_HEX(c)           (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f'))
-#define IS_MARK(c)          ((c) == '-' || (c) == '_' || (c) == '.' || \
-  (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \
-  (c) == ')')
-#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || \
-  (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \
-  (c) == '$' || (c) == ',')

 #if HTTP_PARSER_STRICT
 #define TOKEN(c)            (tokens[(unsigned char)c])
-#define IS_URL_CHAR(c)      (BIT_AT(normal_url_char, (unsigned char)c))
+#define IS_URL_CHAR(c)      (normal_url_char[(unsigned char) (c)])
 #define IS_HOST_CHAR(c)     (IS_ALPHANUM(c) || (c) == '.' || (c) == '-')
 #else
 #define TOKEN(c)            ((c == ' ') ? ' ' : tokens[(unsigned char)c])
 #define IS_URL_CHAR(c)                                                         \
-  (BIT_AT(normal_url_char, (unsigned char)c) || ((c) & 0x80))
+  (normal_url_char[(unsigned char) (c)] || ((c) & 0x80))
 #define IS_HOST_CHAR(c)                                                        \
  (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_')
 #endif
@@ -416,7 +380,7 @@ static struct {
 };
 #undef HTTP_STRERROR_GEN

-int http_message_needs_eof(const http_parser *parser);
+int http_message_needs_eof(http_parser *parser);

 /* Our URL parser.
 *
@@ -432,15 +396,7 @@ int http_message_needs_eof(const http_parser *parser);
 static enum state
 parse_url_char(enum state s, const char ch)
 {
-  if (ch == ' ' || ch == '\r' || ch == '\n') {
-    return s_dead;
-  }
-
-#if HTTP_PARSER_STRICT
-  if (ch == '\t' || ch == '\f') {
-    return s_dead;
-  }
-#endif
+  assert(!isspace(ch));

  switch (s) {
    case s_req_spaces_before_url:
@@ -478,33 +434,67 @@ parse_url_char(enum state s, const char ch)

    case s_req_schema_slash_slash:
      if (ch == '/') {
-        return s_req_server_start;
+        return s_req_host_start;
      }

      break;

-    case s_req_server_with_at:
-      if (ch == '@') {
-        return s_dead;
+    case s_req_host_start:
+      if (ch == '[') {
+        return s_req_host_v6_start;
      }

-    /* FALLTHROUGH */
-    case s_req_server_start:
-    case s_req_server:
-      if (ch == '/') {
-        return s_req_path;
+      if (IS_HOST_CHAR(ch)) {
+        return s_req_host;
      }

-      if (ch == '?') {
-        return s_req_query_string_start;
+      break;
+
+    case s_req_host:
+      if (IS_HOST_CHAR(ch)) {
+        return s_req_host;
      }

-      if (ch == '@') {
-        return s_req_server_with_at;
+      /* FALLTHROUGH */
+    case s_req_host_v6_end:
+      switch (ch) {
+        case ':':
+          return s_req_port_start;
+
+        case '/':
+          return s_req_path;
+
+        case '?':
+          return s_req_query_string_start;
      }

-      if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') {
-        return s_req_server;
+      break;
+
+    case s_req_host_v6:
+      if (ch == ']') {
+        return s_req_host_v6_end;
+      }
+
+      /* FALLTHROUGH */
+    case s_req_host_v6_start:
+      if (IS_HEX(ch) || ch == ':') {
+        return s_req_host_v6;
+      }
+      break;
+
+    case s_req_port:
+      switch (ch) {
+        case '/':
+          return s_req_path;
+
+        case '?':
+          return s_req_query_string_start;
+      }
+
+      /* FALLTHROUGH */
+    case s_req_port_start:
+      if (IS_NUM(ch)) {
+        return s_req_port;
      }

      break;
@@ -626,9 +616,13 @@ size_t http_parser_execute (http_parser *parser,
  case s_req_schema:
  case s_req_schema_slash:
  case s_req_schema_slash_slash:
-  case s_req_server_start:
-  case s_req_server:
-  case s_req_server_with_at:
+  case s_req_host_start:
+  case s_req_host_v6_start:
+  case s_req_host_v6:
+  case s_req_host_v6_end:
+  case s_req_host:
+  case s_req_port_start:
+  case s_req_port:
  case s_req_query_string_start:
  case s_req_query_string:
  case s_req_fragment_start:
@@ -936,7 +930,6 @@ size_t http_parser_execute (http_parser *parser,
          } else if (parser->index == 2  && ch == 'P') {
            parser->method = HTTP_COPY;
          } else {
-            SET_ERRNO(HPE_INVALID_METHOD);
            goto error;
          }
        } else if (parser->method == HTTP_MKCOL) {
@@ -949,14 +942,12 @@ size_t http_parser_execute (http_parser *parser,
          } else if (parser->index == 2 && ch == 'A') {
            parser->method = HTTP_MKACTIVITY;
          } else {
-            SET_ERRNO(HPE_INVALID_METHOD);
            goto error;
          }
        } else if (parser->method == HTTP_SUBSCRIBE) {
          if (parser->index == 1 && ch == 'E') {
            parser->method = HTTP_SEARCH;
          } else {
-            SET_ERRNO(HPE_INVALID_METHOD);
            goto error;
          }
        } else if (parser->index == 1 && parser->method == HTTP_POST) {
@@ -967,27 +958,13 @@ size_t http_parser_execute (http_parser *parser,
          } else if (ch == 'A') {
            parser->method = HTTP_PATCH;
          } else {
-            SET_ERRNO(HPE_INVALID_METHOD);
            goto error;
          }
        } else if (parser->index == 2) {
          if (parser->method == HTTP_PUT) {
-            if (ch == 'R') {
-              parser->method = HTTP_PURGE;
-            } else {
-              SET_ERRNO(HPE_INVALID_METHOD);
-              goto error;
-            }
+            if (ch == 'R') parser->method = HTTP_PURGE;
          } else if (parser->method == HTTP_UNLOCK) {
-            if (ch == 'S') {
-              parser->method = HTTP_UNSUBSCRIBE;
-            } else {
-              SET_ERRNO(HPE_INVALID_METHOD);
-              goto error;
-            }
-          } else {
-            SET_ERRNO(HPE_INVALID_METHOD);
-            goto error;
+            if (ch == 'S') parser->method = HTTP_UNSUBSCRIBE;
          }
        } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') {
          parser->method = HTTP_PROPPATCH;
@@ -1006,7 +983,7 @@ size_t http_parser_execute (http_parser *parser,

        MARK(url);
        if (parser->method == HTTP_CONNECT) {
-          parser->state = s_req_server_start;
+          parser->state = s_req_host_start;
        }

        parser->state = parse_url_char((enum state)parser->state, ch);
@@ -1021,7 +998,10 @@ size_t http_parser_execute (http_parser *parser,
      case s_req_schema:
      case s_req_schema_slash:
      case s_req_schema_slash_slash:
-      case s_req_server_start:
+      case s_req_host_start:
+      case s_req_host_v6_start:
+      case s_req_host_v6:
+      case s_req_port_start:
      {
        switch (ch) {
          /* No whitespace allowed here */
@@ -1041,8 +1021,9 @@ size_t http_parser_execute (http_parser *parser,
        break;
      }

-      case s_req_server:
-      case s_req_server_with_at:
+      case s_req_host:
+      case s_req_host_v6_end:
+      case s_req_port:
      case s_req_path:
      case s_req_query_string_start:
      case s_req_query_string:
@@ -1871,7 +1852,7 @@ error:

 /* Does the parser need to see an EOF to find the end of the message? */
 int
-http_message_needs_eof (const http_parser *parser)
+http_message_needs_eof (http_parser *parser)
 {
  if (parser->type == HTTP_REQUEST) {
    return 0;
@@ -1894,7 +1875,7 @@ http_message_needs_eof (const http_parser *parser)


 int
-http_should_keep_alive (const http_parser *parser)
+http_should_keep_alive (http_parser *parser)
 {
  if (parser->http_major > 0 && parser->http_minor > 0) {
    /* HTTP/1.1 */
@@ -1912,10 +1893,9 @@ http_should_keep_alive (const http_parser *parser)
 }


-const char *
-http_method_str (enum http_method m)
+const char * http_method_str (enum http_method m)
 {
-  return ELEM_AT(method_strings, m, "<unknown>");
+  return method_strings[m];
 }


@@ -1942,144 +1922,6 @@ http_errno_description(enum http_errno err) {
  return http_strerror_tab[err].description;
 }

-static enum http_host_state
-http_parse_host_char(enum http_host_state s, const char ch) {
-  switch(s) {
-    case s_http_userinfo:
-    case s_http_userinfo_start:
-      if (ch == '@') {
-        return s_http_host_start;
-      }
-
-      if (IS_USERINFO_CHAR(ch)) {
-        return s_http_userinfo;
-      }
-      break;
-
-    case s_http_host_start:
-      if (ch == '[') {
-        return s_http_host_v6_start;
-      }
-
-      if (IS_HOST_CHAR(ch)) {
-        return s_http_host;
-      }
-
-      break;
-
-    case s_http_host:
-      if (IS_HOST_CHAR(ch)) {
-        return s_http_host;
-      }
-
-    /* FALLTHROUGH */
-    case s_http_host_v6_end:
-      if (ch == ':') {
-        return s_http_host_port_start;
-      }
-
-      break;
-
-    case s_http_host_v6:
-      if (ch == ']') {
-        return s_http_host_v6_end;
-      }
-
-    /* FALLTHROUGH */
-    case s_http_host_v6_start:
-      if (IS_HEX(ch) || ch == ':') {
-        return s_http_host_v6;
-      }
-
-      break;
-
-    case s_http_host_port:
-    case s_http_host_port_start:
-      if (IS_NUM(ch)) {
-        return s_http_host_port;
-      }
-
-      break;
-
-    default:
-      break;
-  }
-  return s_http_host_dead;
-}
-
-static int
-http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
-  enum http_host_state s;
-
-  const char *p;
-  size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
-
-  u->field_data[UF_HOST].len = 0;
-
-  s = found_at ? s_http_userinfo_start : s_http_host_start;
-
-  for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++) {
-    enum http_host_state new_s = http_parse_host_char(s, *p);
-
-    if (new_s == s_http_host_dead) {
-      return 1;
-    }
-
-    switch(new_s) {
-      case s_http_host:
-        if (s != s_http_host) {
-          u->field_data[UF_HOST].off = p - buf;
-        }
-        u->field_data[UF_HOST].len++;
-        break;
-
-      case s_http_host_v6:
-        if (s != s_http_host_v6) {
-          u->field_data[UF_HOST].off = p - buf;
-        }
-        u->field_data[UF_HOST].len++;
-        break;
-
-      case s_http_host_port:
-        if (s != s_http_host_port) {
-          u->field_data[UF_PORT].off = p - buf;
-          u->field_data[UF_PORT].len = 0;
-          u->field_set |= (1 << UF_PORT);
-        }
-        u->field_data[UF_PORT].len++;
-        break;
-
-      case s_http_userinfo:
-        if (s != s_http_userinfo) {
-          u->field_data[UF_USERINFO].off = p - buf ;
-          u->field_data[UF_USERINFO].len = 0;
-          u->field_set |= (1 << UF_USERINFO);
-        }
-        u->field_data[UF_USERINFO].len++;
-        break;
-
-      default:
-        break;
-    }
-    s = new_s;
-  }
-
-  /* Make sure we don't end somewhere unexpected */
-  switch (s) {
-    case s_http_host_start:
-    case s_http_host_v6_start:
-    case s_http_host_v6:
-    case s_http_host_port_start:
-    case s_http_userinfo:
-    case s_http_userinfo_start:
-      return 1;
-    default:
-      break;
-  }
-
-  return 0;
-}
-
 int
 http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
                      struct http_parser_url *u)
@@ -2087,10 +1929,9 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
  enum state s;
  const char *p;
  enum http_parser_url_fields uf, old_uf;
-  int found_at = 0;

  u->port = u->field_set = 0;
-  s = is_connect ? s_req_server_start : s_req_spaces_before_url;
+  s = is_connect ? s_req_host_start : s_req_spaces_before_url;
  uf = old_uf = UF_MAX;

  for (p = buf; p < buf + buflen; p++) {
@@ -2104,7 +1945,10 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
      /* Skip delimeters */
      case s_req_schema_slash:
      case s_req_schema_slash_slash:
-      case s_req_server_start:
+      case s_req_host_start:
+      case s_req_host_v6_start:
+      case s_req_host_v6_end:
+      case s_req_port_start:
      case s_req_query_string_start:
      case s_req_fragment_start:
        continue;
@@ -2113,14 +1957,15 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
        uf = UF_SCHEMA;
        break;

-      case s_req_server_with_at:
-        found_at = 1;
-
-      /* FALLTROUGH */
-      case s_req_server:
+      case s_req_host:
+      case s_req_host_v6:
        uf = UF_HOST;
        break;

+      case s_req_port:
+        uf = UF_PORT;
+        break;
+
      case s_req_path:
        uf = UF_PATH;
        break;
@@ -2151,19 +1996,23 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
    old_uf = uf;
  }

-  /* host must be present if there is a schema */
-  /* parsing http:///toto will fail */
-  if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) {
-    if (http_parse_host(buf, u, found_at) != 0) {
-      return 1;
-    }
-  }
-
  /* CONNECT requests can only contain "hostname:port" */
  if (is_connect && u->field_set != ((1 << UF_HOST)|(1 << UF_PORT))) {
    return 1;
  }

+  /* Make sure we don't end somewhere unexpected */
+  switch (s) {
+  case s_req_host_v6_start:
+  case s_req_host_v6:
+  case s_req_host_v6_end:
+  case s_req_host:
+  case s_req_port_start:
+    return 1;
+  default:
+    break;
+  }
+
  if (u->field_set & (1 << UF_PORT)) {
    /* Don't bother with endp; we've already validated the string */
    unsigned long v = strtoul(buf + u->field_data[UF_PORT].off, NULL, 10);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
isaacs	c67f8d0500	2013.04.09, Version 0.8.23 (maintenance) * npm: Upgrade to v1.2.18 * http: Avoid EE warning on ECONNREFUSED handling (isaacs) * tls: Re-enable check of CN-ID in cert verification (Tobias Müllerleile) * child_process: fix sending utf-8 to child process (Ben Noordhuis) * crypto: check key type in GetPeerCertificate() (Ben Noordhuis) * win/openssl: mark assembled object files as seh safe (Bert Belder) * windows/msi: fix msi build issue with WiX 3.7/3.8 (Raymond Feng)	2013-04-08 16:51:44 -07:00
isaacs	f2f893b2a7	npm: Upgrade to v1.2.18	2013-04-08 16:47:58 -07:00
isaacs	b2587b2678	http: Avoid EE warning on ECONNREFUSED handling This is a back-port of the same fix in deb1dc279d49463e13af44feed45c79ae0f379f9, for v0.8.	2013-04-08 16:25:50 -07:00
Tobias Müllerleile	1a95ce5214	tls: Re-enable check of CN-ID in cert verification RFC 6125 explicitly states that a client "MUST NOT seek a match for a reference identifier of CN-ID if the presented identifiers include a DNS-ID, SRV-ID, URI-ID, or any application-specific identifier types supported by the client", but it MAY do so if none of the mentioned identifier types (but others) are present.	2013-04-07 19:04:02 +04:00
Ben Noordhuis	84bb0ec613	child_process: fix sending utf-8 to child process In process#send() and child_process.ChildProcess#send(), use 'utf8' as the encoding and correctly handle partial character sequences by introducing a StringDecoder. Before this commit, it used 'ascii' and partial sequences were dropped or corrupted. This is a back-port of commit `44843a6` from the v0.10 branch. Fixes #4999 and #5011.	2013-03-25 13:33:26 +01:00
Ben Noordhuis	2c41a80282	crypto: check key type in GetPeerCertificate() Works around the following exception: Error: 140463203215168:error:0607907F:digital envelope routines:EVP_PKEY_get1_RSA:expecting an rsa key: ../deps/openssl/openssl/crypto/evp/p_lib.c:288: at CleartextStream._pusher (tls.js:656:24) at SlabBuffer.use (tls.js:199:18) at CleartextStream.CryptoStream._push (tls.js:483:33) at SecurePair.cycle (tls.js:880:20) <snip> The issue has been solved properly in v0.10 and the master branch as of commit `c6e2db2` ("crypto: clear error stack"). This is the "back-port" to v0.8. For some (rather unquantifiable) reason the original fix only works for the tls module in v0.8 but not the https module unless OpenSSL is downgraded to 0.9.8. Upgrading OpenSSL does not fix it, however. The https module doesn't appear to be at fault; upgrading it to v0.10 doesn't fix the issue. That leaves either the tls or the http module (that https derives from) but the changes to those modules are too massive to back-port as-is. `git bisect` over the v0.8 -> v0.10 commits didn't show up anything useful, it pinpoints `c6e2db2` as the commit that fixes things. I've spent several hours on this now and seeing that v0.8 is in maintenance mode, this cheap hack will have to do. Fixes #4771.	2013-03-13 16:42:23 +01:00