build: support individual signing keys

2014.06.09, Version 0.8.27 (maintenance)
* openssl: update to 1.0.0m (CVE-2014-0224) * utf8: Prevent Node from sending invalid UTF-8 (Felix Geisendörfer) - *NOTE* this introduces a breaking change, previously you could construct invalid UTF-8 and invoke an error in a client that was expecting valid UTF-8, now unmatched surrogate pairs are replaced with the unknown UTF-8 character. To restore the old functionality simply have NODE_INVALID_UTF8 environment variable set. * tls: fix pool usage race (Fedor Indutny) * fs: close file if fstat() fails in readFile() (cjihrig)
2026-04-28 03:01:10 -04:00 · 2014-06-09 12:44:26 -07:00 · 2014-06-09 11:05:29 -07:00 · 2014-06-06 15:04:40 -07:00 · 2014-06-06 15:04:40 -07:00 · 2014-06-06 15:04:39 -07:00
8159 changed files with 1924869 additions and 259304 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+test/fixtures/* -text
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,45 @@
-build
+core
+vgcore.*
 .waf*
 tags
 .lock-wscript
 *.pyc
 doc/api.xml
-doc/api.html
-doc/node.1
+tmp/
 node
 node_g
+*.swp
+.benchmark_reports
+/.project
+/.cproject
+
+/out
+
+# various stuff that VC++ produces/uses
+Debug/
+Release/
+!doc/blog/**
+*.sln
+!nodemsi.sln
+*.suo
+*.vcproj
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
+UpgradeLog*.XML
+_UpgradeReport_Files/
+ipch/
+*.sdf
+*.opensdf
+
+/config.mk
+/config.gypi
+*-nodegyp*
+/gyp-mac-tool
+/dist-osx
+/npm.wxs
+/tools/msvs/npm.wixobj
+email.md
+deps/v8-*
+./node_modules
+.svn/
--- a/.mailmap
+++ b/.mailmap
@@ -0,0 +1,104 @@
+Aaron Heckmann <aaron.heckmann@gmail.com> <aaron.heckmann+github@gmail.com>
+Abe Fettig <abefettig@gmail.com> <abe@fettig.net>
+Alex Kocharin <rlidwka@kocharin.ru>
+Alex Kocharin <rlidwka@kocharin.ru> <alex@kocharin.ru>
+Alexis Sellier <self@cloudhead.net>
+Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
+Arlo Breault <arlolra@gmail.com>
+Artem Zaytsev <a.arepo@gmail.com>
+Atsuo Fukaya <fukayatsu@gmail.com>
+Ben Noordhuis <info@bnoordhuis.nl> <bnoordhuis@bender.(none)>
+Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
+Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
+Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
+Brian White <mscdex@mscdex.net>
+Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
+Chew Choon Keat <choonkeat@gmail.com>
+Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
+Daniel Berger <code+node@dpbis.net>
+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>
+David Siegel <david@artcom.de> <david.siegel@artcom.de>
+Domenic Denicola <domenic@domenicdenicola.com>
+Eduard Burtescu <eddy_me08@yahoo.com>
+Einar Otto Stangvik <einaros@gmail.com>
+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 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>
+Herbert Vojčík <herby@mailbox.sk>
+Igor Zinkovsky <igorzi@microsoft.com>
+Isaac Z. Schlueter <i@izs.me>
+Isaac Z. Schlueter <i@izs.me> <i@foohack.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>
+Joshua S. Weinstein <josher19@users.sf.net>
+Koichi Kobayashi <koichik@improvement.jp>
+Kris Kowal <kris.kowal@cixar.com>
+Kyle Robinson Young <kyle@dontkry.com>
+Mathias Pettersson <mape@mape.me>
+Michael Bernstein <michaelrbernstein@gmail.com>
+Michael Wilber <gcr@sneakygcr.net>
+Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
+Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
+Nebu Pookins<nebu@nebupookins.net>
+Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Onne Gorter <onne@onnlucky.com>
+Paul Querna <pquerna@apache.org> <paul@querna.org>
+Ray Morgan <rmorgan@zappos.com>
+Ray Solomon <raybsolomon@gmail.com>
+Rick Olson <technoweenie@gmail.com>
+Ryan Dahl <ry@tinyclouds.org>
+Ryan Emery <seebees@gmail.com>
+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>
+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>
+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>
+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 Smart <timehandgod@gmail.com> <tim@fostle.com>
+Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.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>
+Yoshihiro KIKUCHI <yknetg@gmail.com>
+Yuichiro MASUI <masui@masuidrive.jp>
+Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
+Zoran Tomicic <ztomicic@gmail.com>
+
+# These people didn't contribute patches to node directly,
+# but we've landed their v8 patches in the node repository:
+Daniel Clifford <danno@chromium.org>
+Erik Corry <erik.corry@gmail.com>
+Jakob Kummerow <jkummerow@chromium.org>
+Kevin Millikin <kmillikin@chromium.org>
+Lasse R.H. Nielsen <lrn@chromium.org>
+Michael Starzinger <mstarzinger@chromium.org>
+Toon Verwaest <verwaest@chromium.org>
+Vyacheslav Egorov <vegorov@chromium.org>
+Yang Guo <yangguo@chromium.org>
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: node_js
+
+before_script:
+  - "./configure"
+  - "make"
+
+script:
+  - "make test"
+
+notifications:
+  email: false
+  irc:
+    - "irc.freenode.net#libuv"
+
--- a/388
+++ b/388
@@ -0,0 +1,388 @@
+# Authors ordered by first contribution.
+
+Ryan Dahl <ry@tinyclouds.org>
+Urban Hafner <urban@bettong.net>
+Joshaven Potter <yourtech@gmail.com>
+Abe Fettig <abefettig@gmail.com>
+Kevin van Zonneveld <kevin@vanzonneveld.net>
+Michael Carter <cartermichael@gmail.com>
+Jeff Smick <sprsquish@gmail.com>
+Jon Crosby <jon@joncrosby.me>
+Felix Geisendörfer <felix@debuggable.com>
+Ray Morgan <rmorgan@zappos.com>
+Jérémy Lal <kapouer@melix.org>
+Isaac Z. Schlueter <i@izs.me>
+Brandon Beacher <brandon.beacher@gmail.com>
+Tim Caswell <tim@creationix.com>
+Connor Dunn <connorhd@gmail.com>
+Johan Sørensen <johan@johansorensen.com>
+Friedemann Altrock <frodenius@gmail.com>
+Onne Gorter <onne@onnlucky.com>
+Rhys Jones <rhys@wave.to>
+Jan Lehnardt <jan@apache.org>
+Simon Willison <simon@simonwillison.net>
+Chew Choon Keat <choonkeat@gmail.com>
+Jered Schmidt <tr@nslator.jp>
+Michaeljohn Clement <inimino@inimino.org>
+Karl Guertin <grayrest@gr.ayre.st>
+Xavier Shay <xavier@rhnh.net>
+Christopher Lenz <cmlenz@gmail.com>
+TJ Holowaychuk <tj@vision-media.ca>
+Johan Dahlberg <jfd@distrop.com>
+Simon Cornelius P. Umacob <simoncpu@gmail.com>
+Ryan McGrath <ryan@venodesigns.net>
+Rasmus Andersson <rasmus@notion.se>
+Micheil Smith <micheil@brandedcode.com>
+Jonas Pfenniger <jonas@pfenniger.name>
+David Sklar <david.sklar@gmail.com>
+Charles Lehner <celehner1@gmail.com>
+Elliott Cable <me@ell.io>
+Benjamin Thomas <benjamin@benjaminthomas.org>
+San-Tai Hsu <v@fatpipi.com>
+Ben Williamson <benw@pobox.com>
+Joseph Pecoraro <joepeck02@gmail.com>
+Erich Ocean <erich.ocean@me.com>
+Alexis Sellier <self@cloudhead.net>
+Blaine Cook <romeda@gmail.com>
+Stanislav Opichal <opichals@gmail.com>
+Aaron Heckmann <aaron.heckmann@gmail.com>
+Mikeal Rogers <mikeal.rogers@gmail.com>
+Matt Brubeck <mbrubeck@limpet.net>
+Michael Stillwell <mjs@beebo.org>
+Yuichiro MASUI <masui@masuidrive.jp>
+Mark Hansen <mark@markhansen.co.nz>
+Zoran Tomicic <ztomicic@gmail.com>
+Jeremy Ashkenas <jashkenas@gmail.com>
+Scott González <scott.gonzalez@gmail.com>
+James Duncan <james@joyent.com>
+Arlo Breault <arlolra@gmail.com>
+Kris Kowal <kris.kowal@cixar.com>
+Jacek Becela <jacek.becela@gmail.com>
+Rob Ellis <kazoomer@gmail.com>
+Tim Smart <timehandgod@gmail.com>
+Herbert Vojčík <herby@mailbox.sk>
+Krishna Rajendran <krishna@emptybox.org>
+Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Scott Taylor <scott@railsnewbie.com>
+Carson McDonald <carson@ioncannon.net>
+Matt Ranney <mjr@ranney.com>
+James Herdman <james.herdman@gmail.com>
+Julian Lamb <thepurlieu@gmail.com>
+Brian Hammond <brian@fictorial.com>
+Mathias Pettersson <mape@mape.me>
+Trevor Blackwell <tlb@tlb.org>
+Thomas Lee <thomas.lee@shinetech.com>
+Daniel Berger <code+node@dpbis.net>
+Paulo Matias <paulo.matias@usp.br>
+Peter Griess <pg@std.in>
+Jonathan Knezek <jdknezek@gmail.com>
+Jonathan Rentzsch <jwr.git@redshed.net>
+Ben Noordhuis <info@bnoordhuis.nl>
+Elijah Insua <tmpvar@gmail.com>
+Andrew Johnston <apjohnsto@gmail.com>
+Brian White <mscdex@mscdex.net>
+Aapo Laitinen <aapo.laitinen@iki.fi>
+Sam Hughes <sam@samuelhughes.com>
+Orlando Vazquez <ovazquez@gmail.com>
+Raffaele Sena <raff367@gmail.com>
+Brian McKenna <brian@brianmckenna.org>
+Paul Querna <pquerna@apache.org>
+Ben Lowery <ben@blowery.org>
+Peter Dekkers <soderblom.peter@gmail.com>
+David Siegel <david@artcom.de>
+Marshall Culpepper <marshall.law@gmail.com>
+Ruben Rodriguez <cha0s@therealcha0s.net>
+Dmitry Baranovskiy <Dmitry@Baranovskiy.com>
+Blake Mizerany <blake.mizerany@gmail.com>
+Jerome Etienne <jerome.etienne@gmail.com>
+Dmitriy Shalashov <skaurus@gmail.com>
+Adam Wiggins <adam@heroku.com>
+Rick Olson <technoweenie@gmail.com>
+Sergey Kryzhanovsky <skryzhanovsky@gmail.com>
+Marco Rogers <marco.rogers@gmail.com>
+Benjamin Fritsch <beanie@benle.de>
+Jan Kassens <jan@kassens.net>
+Robert Keizer <root@black.bluerack.ca>
+Sam Shull <brickysam26@gmail.com>
+Chandra Sekar S <chandru.in@gmail.com>
+Andrew Naylor <argon@mkbot.net>
+Benjamin Kramer <benny.kra@gmail.com>
+Danny Coates <dannycoates@gmail.com>
+Nick Stenning <nick@whiteink.com>
+Bert Belder <bertbelder@gmail.com>
+Trent Mick <trentm@gmail.com>
+Fedor Indutny <fedor.indutny@gmail.com>
+Illarionov Oleg <oleg@emby.ru>
+Aria Stewart <aredridel@nbtsc.org>
+Johan Euphrosine <proppy@aminche.com>
+Russell Haering <russellhaering@gmail.com>
+Bradley Meck <bradley.meck@gmail.com>
+Tobie Langel <tobie.langel@gmail.com>
+Tony Metzidis <tonym@tonym.us>
+Mark Nottingham <mnot@mnot.net>
+Sam Stephenson <sam@37signals.com>
+Jorge Chamorro Bieling <jorge@jorgechamorro.com>
+Evan Larkin <evan.larkin.il.com>
+Sean Coates <sean@seancoates.com>
+Tom Hughes <tom.hughes@palm.com>
+Joshua Peek <josh@joshpeek.com>
+Nathan Rajlich <nathan@tootallnate.net>
+Peteris Krumins <peteris.krumins@gmail.com>
+AJ ONeal <coolaj86@gmail.com>
+Sami Samhuri <sami.samhuri@gmail.com>
+Nikhil Marathe <nsm.nikhil@gmail.com>
+Vitali Lovich <vitali.lovich@palm.com>
+Stéphan Kochen <stephan@kochen.nl>
+Oleg Efimov <efimovov@gmail.com>
+Guillaume Tuton <guillaume@tuton.fr>
+Tim Cooijmans <tim@aapopfiets.nl>
+Dan Søndergaard <dan1990@gmail.com>
+Silas Sewell <silas@sewell.ch>
+Wade Simmons <wade@wades.im>
+Daniel Gröber <darklord@darkboxed.org>
+Travis Swicegood <development@domain51.com>
+Oleg Slobodskoi <oleg008@gmail.com>
+Jeremy Martin <jmar777@gmail.com>
+Michael Wilber <gcr@sneakygcr.net>
+Sean Braithwaite <brapse@gmail.com>
+Anders Conbere <aconbere@gmail.com>
+Devin Torres <devin@devintorres.com>
+Theo Schlossnagle <jesus@omniti.com>
+Kai Chen <kaichenxyz@gmail.com>
+Daniel Chcouri <333222@gmail.com>
+Mihai Călin Bazon <mihai@bazon.net>
+Ali Farhadi <a.farhadi@gmail.com>
+Daniel Ennis <aikar@aikar.co>
+Carter Allen <CarterA@opt-6.com>
+Greg Hughes <greg@ghughes.com>
+David Trejo <david.daniel.trejo@gmail.com>
+Joe Walnes <joe@walnes.com>
+Koichi Kobayashi <koichik@improvement.jp>
+Konstantin Käfer <github@kkaefer.com>
+Richard Rodger <richard@ricebridge.com>
+Andreas Reich <andreas@reich.name>
+Tony Huang <cnwzhjs@gmail.com>
+Dean McNamee <dean@gmail.com>
+Trevor Burnham <trevor@databraid.com>
+Zachary Scott <zachary@zacharyscott.net>
+Arnout Kazemier <info@3rd-Eden.com>
+George Stagas <gstagas@gmail.com>
+Ben Weaver <ben@orangesoda.net>
+Scott McWhirter <scott.mcwhirter@joyent.com>
+Jakub Lekstan <jakub.lekstan@dreamlab.pl>
+Nick Campbell <nicholas.j.campbell@gmail.com>
+Nebu Pookins <nebu@nebupookins.net>
+Tim Baumann <tim@timbaumann.info>
+Robert Mustacchi <rm@joyent.com>
+George Miroshnykov <george.miroshnykov@gmail.com>
+Mark Cavage <mark.cavage@joyent.com>
+Håvard Stranden <havard.stranden@gmail.com>
+Marcel Laverdet <marcel@laverdet.com>
+Alexandre Marangone <a.marangone@gmail.com>
+Ryan Petrello <lists@ryanpetrello.com>
+Fuji Goro <gfuji@cpan.org>
+Siddharth Mahendraker <siddharth_mahen@hotmail.com>
+Dave Pacheco <dap@joyent.com>
+Mathias Buus <m@ge.tt>
+Henry Rawas <henryr@schakra.com>
+Yoshihiro KIKUCHI <yknetg@gmail.com>
+Brett Kiefer <kiefer@gmail.com>
+Mariano Iglesias <mariano@cricava.com>
+Jörn Horstmann <git@jhorstmann.net>
+Joe Shaw <joe@joeshaw.org>
+Niklas Fiekas <niklas.fiekas@googlemail.com>
+Adam Luikart <me@adamluikart.com>
+Artem Zaytsev <a.arepo@gmail.com>
+Alex Xu <alex_y_xu@yahoo.ca>
+Jeremy Selier <jeremy@jolicloud.com>
+Igor Zinkovsky <igorzi@microsoft.com>
+Kip Gebhardt <kip.gebhardt@voxer.com>
+Stefan Rusu <saltwaterc@gmail.com>
+Shigeki Ohtsu <ohtsu@d.jp>
+Wojciech Wnętrzak <w.wnetrzak@gmail.com>
+Devon Govett <devongovett@gmail.com>
+Steve Engledow <steve.engledow@proxama.com>
+Pierre-Alexandre St-Jean <pierrealexandre.stjean@gmail.com>
+Reid Burke <me@reidburke.com>
+Vicente Jimenez Aguilar <googuy@gmail.com>
+Tadashi SAWADA <cesare@mayverse.jp>
+Jeroen Janssen <jeroen.janssen@gmail.com>
+Daniel Pihlström <sciolist.se@gmail.com>
+Stefan Bühler <stbuehler@web.de>
+Alexander Uvarov <alexander.uvarov@gmail.com>
+Aku Kotkavuo <aku@hibana.net>
+Peter Bright <drpizza@quiscalusmexicanus.org>
+Logan Smyth <loganfsmyth@gmail.com>
+Christopher Wright <christopherwright@gmail.com>
+Glen Low <glen.low@pixelglow.com>
+Thomas Shinnick <tshinnic@gmail.com>
+Mickaël Delahaye <mickael.delahaye@gmail.com>
+Antranig Basman <antranig.basman@colorado.edu>
+Maciej Małecki <maciej.malecki@notimplemented.org>
+Evan Martin <martine@danga.com>
+Peter Lyons <pete@peterlyons.com>
+Jann Horn <jannhorn@googlemail.com>
+Abimanyu Raja <abimanyuraja@gmail.com>
+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>
+Vitor Balocco <vitorbal@gmail.com>
+Ben Leslie <benno@benno.id.au>
+Eric Lovett <etlovett@gmail.com>
+Christian Tellnes <christian@tellnes.no>
+Colton Baker <github@netrefuge.net>
+Tyler Larson <talltyler@gmail.com>
+Tomasz Janczuk <tomasz@janczuk.org>
+Ilya Dmitrichenko <errordeveloper@gmail.com>
+Simen Brekken <simen.brekken@gmail.com>
+Guglielmo Ferri <44gatti@gmail.com>
+Thomas Parslow <tom@almostobsolete.net>
+Ryan Emery <seebees@gmail.com>
+Jordan Sissel <jls@semicomplete.com>
+Matt Robenolt <matt@ydekproductions.com>
+Jacob H.C. Kragh <jhckragh@gmail.com>
+Benjamin Pasero <benjamin.pasero@gmail.com>
+Scott Anderson <sanderson7@gmail.com>
+Yoji SHIDARA <dara@shidara.net>
+Mathias Bynens <mathias@qiwi.be>
+Łukasz Walukiewicz <lukasz@walukiewicz.eu>
+Artur Adib <arturadib@gmail.com>
+E. Azer Koçulu <azer@kodfabrik.com>
+Paddy Byers <paddy.byers@gmail.com>
+Roman Shtylman <shtylman@gmail.com>
+Kyle Robinson Young <kyle@dontkry.com>
+Tim Oxley <secoif@gmail.com>
+Eduard Burtescu <eddy_me08@yahoo.com>
+Ingmar Runge <ingmar@irsoft.de>
+Russ Bradberry <rbradberry@gmail.com>
+Andreas Madsen <amwebdk@gmail.com>
+Adam Malcontenti-Wilson <adman.com@gmail.com>
+Avi Flax <avi@aviflax.com>
+Pedro Teixeira <pedro.teixeira@gmail.com>
+Johan Bergström <bugs@bergstroem.nu>
+James Hartig <james.hartig@grooveshark.com>
+Shannen Saez <shannenlaptop@gmail.com>
+Seong-Rak Choi <ragiragi@hanmail.net>
+Dave Irvine <davman99@gmail.com>
+Ju-yeong Park <interruptz@gmail.com>
+Phil Sung <psung@dnanexus.com>
+Damon Oehlman <damon.oehlman@sidelab.com>
+Mikael Bourges-Sevenier <mikeseven@gmail.com>
+Emerson Macedo <emerleite@gmail.com>
+Ryunosuke SATO <tricknotes.rs@gmail.com>
+Michael Bernstein <michaelrbernstein@gmail.com>
+Guillermo Rauch <rauchg@gmail.com>
+Dan Williams <dan@igniter.com>
+Brandon Benvie <brandon@bbenvie.com>
+Nicolas LaCasse <nlacasse@borderstylo.com>
+Dan VerWeire <dverweire@gmail.com>
+Matthew Fitzsimmons <matt@joyent.com>
+Philip Tellis <philip.tellis@gmail.com>
+Christopher Jeffrey <chjjeffrey@gmail.com>
+Seth Fitzsimmons <seth@mojodna.net>
+Einar Otto Stangvik <einaros@gmail.com>
+Paul Vorbach <paul@vorb.de>
+Luke Gallagher <notfornoone@gmail.com>
+Tomasz Buchert <tomek.buchert@gmail.com>
+Myles Byrne <myles@myles.id.au>
+T.C. Hollingsworth <tchollingsworth@gmail.com>
+Cam Pedersen <diffference@gmail.com>
+Roly Fentanes <roly426@gmail.com>
+Ted Young <ted@radicaldesigns.org>
+Joshua Holbrook <josh.holbrook@gmail.com>
+Blake Miner <miner.blake@gmail.com>
+Vincent Ollivier <contact@vincentollivier.com>
+Jimb Esser <jimb@railgun3d.com>
+Sambasiva Suda <sambasivarao@gmail.com>
+Sadique Ali <sadiqalikm@gmail.com>
+Dmitry Nizovtsev <dmitry@ukrteam.com>
+Alex Kocharin <rlidwka@kocharin.ru>
+Ming Liu <vmliu1@gmail.com>
+Shea Levy <shea@shealevy.com>
+Nao Iizuka <iizuka@kyu-mu.net>
+Christian Ress <christian@ressonline.de>
+Rod Vagg <rod@vagg.org>
+Matt Ezell <ezell.matt@gmail.com>
+Charlie McConnell <charlie@charlieistheman.com>
+Farid Neshat <FaridN_SOAD@yahoo.com>
+Johannes Wüller <johanneswueller@gmail.com>
+Erik Lundin <mjor.himself@gmail.com>
+Bryan Cantrill <bryan@joyent.com>
+Yosef Dinerstein <yosefd@microsoft.com>
+Nathan Friedly <nathan@nfriedly.com>
+Aaron Jacobs <jacobsa@google.com>
+Mustansir Golawala <mgolawala@gmail.com>
+Atsuo Fukaya <fukayatsu@gmail.com>
+Domenic Denicola <domenic@domenicdenicola.com>
+Joshua S. Weinstein <josher19@users.sf.net>
+Dane Springmeyer <dane@dbsgeo.com>
+Erik Dubbelboer <erik@dubbelboer.com>
+Malte-Thorben Bruns <skenqbx@googlemail.com>
+Michael Thomas <aelmalinka@gmail.com>
+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>
+James Koval <james.ross.koval@gmail.com>
+Kevin Gadd <kevin.gadd@gmail.com>
+Ray Solomon <raybsolomon@gmail.com>
+Kevin Bowman <github@magicmonkey.org>
+Matt Gollob <mattgollob@gmail.com>
+Simon Sturmer <sstur@me.com>
+Joel Brandt <joelrbrandt@gmail.com>
+Marc Harter <wavded@gmail.com>
+Nuno Job <nunojobpinto@gmail.com>
+Ben Kelly <ben@wanderview.com>
+Felix Böhm <felixboehm55@googlemail.com>
+Gabriel de Perthuis <g2p.code@gmail.com>
+Tim Macfarlane <timmacfarlane@gmail.com>
+Jonas Westerlund <jonas.westerlund@me.com>
+Dominic Tarr <dominic.tarr@gmail.com>
+Justin Plock <jplock@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>
+Peter Rybin <peter.rybin@gmail.com>
+Eugen Dueck <eugen@dueck.org>
+Gil Pedersen <git@gpost.dk>
+Tyler Neylon <tylerneylon@gmail.com>
+Golo Roden <webmaster@goloroden.de>
+Ron Korving <rkorving@wizcorp.jp>
+Brandon Wilson <chlavois@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>
+Adam Blackburn <regality@gmail.com>
+Willi Eggeling <email@wje-online.de>
+Andrew Paprocki <andrew@ishiboo.com>
+Max Ogden <max@maxogden.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>
+Jacob Gable <jacob.gable@gmail.com>
+Rick Yakubowski <richard@orpha-systems.com>
+Dan Kohn <dan@dankohn.com>
+Timothy J Fontaine <tjfontaine@gmail.com>
+Eugene Girshov <eugene.girshov@nixu.com>
+Raymond Feng <enjoyjava@gmail.com>
+Tobias Müllerleile <tobias@muellerleile.net>
+Daniel Chatfield <chatfielddaniel@gmail.com>
+cjihrig <cjihrig@gmail.com>
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+all:
+	@echo "I need GNU make. Please run \`gmake\` instead."
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,145 @@
+# CONTRIBUTING
+
+The node.js project welcomes new contributors.  This document will guide you
+through the process.
+
+
+### FORK
+
+Fork the project [on GitHub](https://github.com/joyent/node) and check out
+your copy.
+
+```
+$ git clone git@github.com:username/node.git
+$ cd node
+$ git remote add upstream git://github.com/joyent/node.git
+```
+
+Now decide if you want your feature or bug fix to go into the master branch
+or the stable branch.  As a rule of thumb, bug fixes go into the stable branch
+while new features go into the master branch.
+
+The stable branch is effectively frozen; patches that change the node.js
+API/ABI or affect the run-time behavior of applications get rejected.
+
+The rules for the master branch are less strict; consult the
+[stability index page][] for details.
+
+In a nutshell, modules are at varying levels of API stability.  Bug fixes are
+always welcome but API or behavioral  changes to modules at stability level 3
+and up are off-limits.
+
+Node.js has several bundled dependencies in the deps/ and the tools/
+directories that are not part of the project proper.  Any changes to files
+in those directories or its subdirectories should be sent to their respective
+projects.  Do not send your patch to us, we cannot accept it.
+
+In case of doubt, open an issue in the [issue tracker][], post your question
+to the [node.js mailing list][] or contact one of the [project maintainers][]
+on [IRC][].
+
+Especially do so if you plan to work on something big.  Nothing is more
+frustrating than seeing your hard work go to waste because your vision
+does not align with that of a project maintainer.
+
+
+### BRANCH
+
+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.8
+```
+
+(Where v0.8 is the latest stable branch as of this writing.)
+
+
+### COMMIT
+
+Make sure git knows your name and email address:
+
+```
+$ git config --global user.name "J. Random User"
+$ git config --global user.email "j.random.user@example.com"
+```
+
+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.
+2. Keep the second line blank.
+3. Wrap all other lines at 72 columns.
+
+A good commit log looks like this:
+
+```
+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
+being fixed, etc etc.
+
+The body of the commit message can be several paragraphs, and
+please do proper word-wrap and keep columns shorter than about
+72 characters or so. That way `git log` will show things
+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`.
+
+Have a look at `git log` for inspiration.
+
+
+### REBASE
+
+Use `git rebase` (not `git merge`) to sync your work from time to time.
+
+```
+$ git fetch upstream
+$ git rebase upstream/v0.8  # or upstream/master
+```
+
+
+### TEST
+
+Bug fixes and features should come with tests.  Add your tests in the
+test/simple/ directory.  Look at other tests to see how they should be
+structured (license boilerplate, common includes, etc.).
+
+```
+$ make jslint test
+```
+
+Make sure the linter is happy and that all tests pass.  Please, do not submit
+patches that fail either check.
+
+
+### PUSH
+
+```
+$ git push origin my-feature-branch
+```
+
+Go to https://github.com/username/node and select your feature branch.  Click
+the 'Pull Request' button and fill out the form.
+
+Pull requests are usually reviewed within a few days.  If there are comments
+to address, apply your changes in a separate commit and push that to your
+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
+[IRC]: http://webchat.freenode.net/?channels=node.js
+[project maintainers]: https://github.com/joyent/node/wiki/Project-Organization
--- a/3393
+++ b/3393
--- a/619
+++ b/619
@@ -1,38 +1,8 @@
-This license applies to all parts of Node that are not externally
-maintained libraries.  The externally maintained libraries used by Node
-are:
-
-  - v8, located under deps/v8, which is copyrighted by the Google, Inc.
-    v8 has an MIT license. 
-
-  - libev, located under deps/libev, and libeio, located at deps/libeio. 
-    This code is copyrighted by Marc Alexander Lehmann. Both are dually
-    licensed under MIT and GPL2.
-
-  - JSMin JavaScript minifier, located at tools/jsmin.py.  This code is
-    copyrighted by Douglas Crockford and Baruch Even and has an MIT license.
-
-  - parseUri, a URI parser, is located in lib/http.js. This is just a small
-    snippit. It is copyrighted 2007 by Steven Levithan and released under an
-    MIT license.
-
-  - WAF build system, located at tools/waf. Copyrighted Thomas Nagy.
-    Released under an MIT license.
-
-  - The SCONS build system, located at tools/scons. Copyrighted by the SCONS
-    Foundation.  Released under an MIT license.
-
-  - UDNS, an asynchronous DNS client, located at deps/udns. Copyrighted by
-    Michael Tokarev <mjt@corpit.ru>. Released under the GNU Lesser General
-    Public License version 2.1.
-
-Additionally deps/http_parser is based on Zed Shaw's Mongrel.  Mongrel is
-copyrighted by Zed Shaw and distributed under GPL2 or a permissive open
-licence. See deps/http_parser/LICENCE for more information.
-
 Node's license follows:

-Copyright 2009, Ryan Lienhart Dahl. All rights reserved.
+====
+
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 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
@@ -49,4 +19,585 @@ 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. 
+IN THE SOFTWARE.
+
+====
+
+This license applies to all parts of Node that are not externally
+maintained libraries. The externally maintained libraries used by Node are:
+
+- V8, located at deps/v8. V8's license follows:
+  """
+    This license applies to all parts of V8 that are not externally
+    maintained libraries.  The externally maintained libraries used by V8
+    are:
+
+      - PCRE test suite, located in
+        test/mjsunit/third_party/regexp-pcre.js.  This is based on the
+        test suite from PCRE-7.3, which is copyrighted by the University
+        of Cambridge and Google, Inc.  The copyright notice and license
+        are embedded in regexp-pcre.js.
+
+      - Layout tests, located in test/mjsunit/third_party.  These are
+        based on layout tests from webkit.org which are copyrighted by
+        Apple Computer, Inc. and released under a 3-clause BSD license.
+
+      - Strongtalk assembler, the basis of the files assembler-arm-inl.h,
+        assembler-arm.cc, assembler-arm.h, assembler-ia32-inl.h,
+        assembler-ia32.cc, assembler-ia32.h, assembler-x64-inl.h,
+        assembler-x64.cc, assembler-x64.h, assembler-mips-inl.h,
+        assembler-mips.cc, assembler-mips.h, assembler.cc and assembler.h.
+        This code is copyrighted by Sun Microsystems Inc. and released
+        under a 3-clause BSD license.
+
+      - Valgrind client API header, located at third_party/valgrind/valgrind.h
+        This is release under the BSD license.
+
+    These libraries have their own licenses; we recommend you read them,
+    as their terms may differ from the terms below.
+
+    Copyright 2006-2012, the V8 project authors. 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 Google 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.
+  """
+
+- 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.
+     *
+     * 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.
+  """
+
+- OpenSSL located at deps/openssl. OpenSSL is cryptographic software written
+  by Eric Young (eay@cryptsoft.com) to provide SSL/TLS encryption. OpenSSL's
+  license follows:
+  """
+    /* ====================================================================
+     * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+     *
+     * 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. All advertising materials mentioning features or use of this
+     *    software must display the following acknowledgment:
+     *    "This product includes software developed by the OpenSSL Project
+     *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+     *
+     * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+     *    endorse or promote products derived from this software without
+     *    prior written permission. For written permission, please contact
+     *    openssl-core@openssl.org.
+     *
+     * 5. Products derived from this software may not be called "OpenSSL"
+     *    nor may "OpenSSL" appear in their names without prior written
+     *    permission of the OpenSSL Project.
+     *
+     * 6. Redistributions of any form whatsoever must retain the following
+     *    acknowledgment:
+     *    "This product includes software developed by the OpenSSL Project
+     *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+     * EXPRESSED 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 OpenSSL PROJECT OR
+     * ITS 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.
+     * ====================================================================
+     *
+     * This product includes cryptographic software written by Eric Young
+     * (eay@cryptsoft.com).  This product includes software written by Tim
+     * Hudson (tjh@cryptsoft.com).
+     *
+     */
+  """
+
+- HTTP Parser, located at deps/http_parser. HTTP Parser's license follows:
+  """
+    http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
+    Igor Sysoev.
+
+    Additional changes are licensed under the same terms as NGINX and
+    copyright Joyent, Inc. and other Node contributors. All rights reserved.
+
+    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.
+  """
+
+- Closure Linter is located at tools/closure_linter. Closure's license
+  follows:
+  """
+    # Copyright (c) 2007, Google 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 Google 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.
+  """
+
+- tools/cpplint.py is a C++ linter. Its license follows:
+  """
+    # Copyright (c) 2009 Google 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 Google 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/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.
+  """
+    * Punycode.js <http://mths.be/punycode>
+    * Copyright 2011 Mathias Bynens <http://mathiasbynens.be/>
+    * Available under MIT license <http://mths.be/mit>
+  """
+
+- tools/gyp. GYP is a meta-build system. GYP's license follows:
+  """
+    Copyright (c) 2009 Google 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 Google 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.
+  """
+
+- Zlib at deps/zlib. zlib's license follows:
+  """
+    /* zlib.h -- interface of the 'zlib' general purpose compression library
+      version 1.2.4, March 14th, 2010
+
+      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
+      arising from the use of this software.
+
+      Permission is granted to anyone to use this software for any purpose,
+      including commercial applications, and to alter it and redistribute it
+      freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not
+         claim that you wrote the original software. If you use this software
+         in a product, an acknowledgment in the product documentation would be
+         appreciated but is not required.
+      2. Altered source versions must be plainly marked as such, and must not be
+         misrepresented as being the original software.
+      3. This notice may not be removed or altered from any source distribution.
+
+      Jean-loup Gailly
+      Mark Adler
+
+    */
+  """
+
+- npm is a package manager program located at deps/npm.
+  npm's license follows:
+  """
+    Copyright 2009-2012, Isaac Z. Schlueter (the "Original Author")
+    All rights reserved.
+
+    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.
+
+
+    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 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) 2007 by Tjarda Koster, http://jelloween.deviantart.com
+    included for use in the npm website and documentation,
+    used with permission.
+
+    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
+  license follows:
+  """
+    Copyright (c) 2011-2012, Christopher Jeffrey (https://github.com/chjj/)
+
+    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.
+  """
+
+- test/gc/node_modules/weak. Node-weak is a node.js addon that provides garbage
+  collector notifications. Node-weak's license follows:
+  """
+    Copyright (c) 2011, Ben Noordhuis <info@bnoordhuis.nl>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  """
+
+- src/ngx-queue.h. ngx-queue.h is taken from the nginx source tree. nginx's
+  license follows:
+  """
+    Copyright (C) 2002-2012 Igor Sysoev
+    Copyright (C) 2011,2012 Nginx, Inc.
+
+    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.
+
+    THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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.
+  """
--- a/357
+++ b/357
@@ -1,71 +1,316 @@
-all:
-	@tools/waf-light build
+-include config.mk

-all-debug:
-	@tools/waf-light -v build
+BUILDTYPE ?= Release
+PYTHON ?= python
+DESTDIR ?=
+SIGN ?=

-all-progress:
-	@tools/waf-light -p build
+# Default to verbose builds.
+# To do quiet/pretty builds, run `make V=` to set V to an empty string,
+# or set the V environment variable to an empty string.
+V ?= 1

-install:
-	@tools/waf-light install
+# BUILDTYPE=Debug builds both release and debug builds. If you want to compile
+# just the debug build, run `make -C out BUILDTYPE=Debug` instead.
+ifeq ($(BUILDTYPE),Release)
+all: out/Makefile node
+else
+all: out/Makefile node node_g
+endif
+
+# The .PHONY is needed to ensure that we recursively use the out/Makefile
+# to check for changes.
+.PHONY: node node_g
+
+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 node_g
+
+config.gypi: 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)

 uninstall:
-	@tools/waf-light uninstall
-
-test: all
-	python tools/test.py --mode=release
-
-test-all: all
-	python tools/test.py --mode=debug,release
-
-test-debug: all
-	python tools/test.py --mode=debug
-
-benchmark: all
-	build/default/node benchmark/run.js
-
-doc: doc/node.1 doc/api.html doc/index.html
-
-doc/api.html: doc/api.txt
-	asciidoc --unsafe              \
-		-a theme=pipe                \
-		-a toc                       \
-		-a linkcss                   \
-		-o doc/api.html doc/api.txt
-
-doc/api.xml: doc/api.txt
-	asciidoc -b docbook -d manpage -o doc/api.xml doc/api.txt
-
-doc/node.1: doc/api.xml
-	xsltproc --output doc/node.1 --nonet doc/manpage.xsl doc/api.xml
-
-website-upload: doc
-	scp doc/* linode:~/tinyclouds/node/
+	$(PYTHON) tools/install.py $@ $(DESTDIR)

 clean:
-	@-rm -f doc/node.1 doc/api.xml doc/api.html
-	@tools/waf-light clean
+	-rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md
+	-find out/ -name '*.o' -o -name '*.a' | xargs rm -rf
+	-rm -rf node_modules

-distclean: clean
-	@-rm -rf build/
-	@-find tools/ -name "*.pyc" -delete
+distclean:
+	-rm -rf out
+	-rm -f config.gypi
+	-rm -f config.mk
+	-rm -rf node node_g blog.html email.md
+	-rm -rf node_modules

-check:
-	@tools/waf-light check
+test: all
+	$(PYTHON) tools/test.py --mode=release simple message
+	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

-VERSION=$(shell git-describe)
+test-http1: all
+	$(PYTHON) tools/test.py --mode=release --use-http1 simple message
+
+test-valgrind: all
+	$(PYTHON) tools/test.py --mode=release --valgrind simple message
+
+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
+	$(PYTHON) tools/test.py --mode=release gc
+
+test-all: all test/gc/node_modules/weak/build
+	$(PYTHON) tools/test.py --mode=debug,release
+	make test-npm
+
+test-all-http1: all
+	$(PYTHON) tools/test.py --mode=debug,release --use-http1
+
+test-all-valgrind: all
+	$(PYTHON) tools/test.py --mode=debug,release --valgrind
+
+test-release: all
+	$(PYTHON) tools/test.py --mode=release
+
+test-debug: all
+	$(PYTHON) tools/test.py --mode=debug
+
+test-message: all
+	$(PYTHON) tools/test.py message
+
+test-simple: all
+	$(PYTHON) tools/test.py simple
+
+test-pummel: all
+	$(PYTHON) tools/test.py pummel
+
+test-internet: all
+	$(PYTHON) tools/test.py internet
+
+test-npm: node
+	./node deps/npm/test/run.js
+
+test-npm-publish: node
+	npm_package_config_publishtest=true ./node deps/npm/test/run.js
+
+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 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_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/ blog node
+
+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 $@
+
+out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
+	cp $< $@
+
+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
+	out/Release/node tools/doc/generate.js --format=json $< > $@
+
+out/doc/api/%.html: doc/api/%.markdown node
+	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' > $@
+	cat tools/email-footer.md | sed -e 's|__VERSION__|'$(VERSION)'|g' >> $@
+
+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 '\
+    rm -f ~/web/nodejs.org/dist/latest &&\
+    ln -s $(VERSION) ~/web/nodejs.org/dist/latest &&\
+    rm -f ~/web/nodejs.org/docs/latest &&\
+    ln -s $(VERSION) ~/web/nodejs.org/docs/latest &&\
+    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'
+
+docopen: out/doc/api/all.html
+	-google-chrome out/doc/api/all.html
+
+docclean:
+	-rm -rf out/doc
+
+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)
+DESTCPU ?= x64
+else
+DESTCPU ?= ia32
+endif
+ifeq ($(DESTCPU),x64)
+ARCH=x64
+else
+ARCH=x86
+endif
 TARNAME=node-$(VERSION)
+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

-dist: doc/node.1 doc/api.html
-	git-archive --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar
-	mkdir -p $(TARNAME)/doc
+dist: doc $(TARBALL) $(PKG)
+
+PKGDIR=out/dist-osx
+
+release-only:
+	@if [ "$(shell git status --porcelain | egrep -v '^\?\? ')" = "" ]; then \
+		exit 0 ; \
+	else \
+	  echo "" >&2 ; \
+		echo "The git repository is not clean." >&2 ; \
+		echo "Please commit changes before building release tarball." >&2 ; \
+		echo "" >&2 ; \
+		git status --porcelain | egrep -v '^\?\?' >&2 ; \
+		echo "" >&2 ; \
+		exit 1 ; \
+	fi
+	@if [ "$(RELEASE)" = "1" ]; then \
+		exit 0; \
+	else \
+	  echo "" >&2 ; \
+		echo "#NODE_VERSION_IS_RELEASE is set to $(RELEASE)." >&2 ; \
+	  echo "Did you remember to update src/node_version.cc?" >&2 ; \
+	  echo "" >&2 ; \
+		exit 1 ; \
+	fi
+
+pkg: $(PKG)
+
+$(PKG): release-only
+	rm -rf $(PKGDIR)
+	rm -rf out/deps out/Release
+	./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32
+	$(MAKE) install V=$(V)
+	rm -rf out/deps out/Release
+	./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64
+	$(MAKE) install V=$(V)
+	SIGN="$(APP_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) \
+		--id "org.nodejs.Node" \
+		--doc tools/osx-pkg.pmdoc \
+		--out $(PKG)
+	SIGN="$(INT_SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh
+
+$(TARBALL): release-only node doc
+	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
+	mkdir -p $(TARNAME)/doc/api
 	cp doc/node.1 $(TARNAME)/doc/node.1
-	cp doc/api.html $(TARNAME)/doc/api.html
-	tar rf $(TARNAME).tar   \
-		$(TARNAME)/doc/node.1 \
-		$(TARNAME)/doc/api.html
-	rm -r $(TARNAME)
+	cp -r out/doc/api/* $(TARNAME)/doc/api/
+	rm -rf $(TARNAME)/deps/v8/test # too big
+	rm -rf $(TARNAME)/doc/images # too big
+	find $(TARNAME)/ -type l | xargs rm # annoying on windows
+	tar -cf $(TARNAME).tar $(TARNAME)
+	rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar

-.PHONY: benchmark clean dist distclean check uninstall install all test test-all website-upload
+tar: $(TARBALL)
+
+$(BINARYTAR): release-only
+	rm -rf $(BINARYNAME)
+	rm -rf out/deps out/Release
+	./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) $(CONFIG_FLAGS)
+	$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
+	cp README.md $(BINARYNAME)
+	cp LICENSE $(BINARYNAME)
+	cp ChangeLog $(BINARYNAME)
+	tar -cf $(BINARYNAME).tar $(BINARYNAME)
+	rm -rf $(BINARYNAME)
+	gzip -f -9 $(BINARYNAME).tar
+
+binary: $(BINARYTAR)
+
+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
+
+bench:
+	 benchmark/http_simple_bench.sh
+
+bench-idle:
+	./node benchmark/idle_server.js &
+	sleep 1
+	./node benchmark/idle_clients.js &
+
+jslintfix:
+	PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
+
+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
+
+cpplint:
+	@$(PYTHON) tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c)
+
+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
--- a/25
+++ b/25
@@ -1,25 +0,0 @@
-Evented I/O for V8 javascript.
-
-To build:
-
-  ./configure
-  make 
-  make install
-
-To run the tests:
-  
-  make test
-
-To build the documentation and install it, you will need asciidoc and
-xsltproc:
-
-  make doc install
- 
-To read the documentation:
-
-  man doc/node.1
-
-See http://nodejs.org/ for more information. For help and discussion
-subscribe to the mailing list by visiting
-http://groups.google.com/group/nodejs or by sending an email to
-nodejs+subscribe@googlegroups.com.
--- a/README.md
+++ b/README.md
@@ -0,0 +1,60 @@
+Evented I/O for V8 javascript. [![Build Status](https://secure.travis-ci.org/joyent/node.png)](http://travis-ci.org/joyent/node)
+===
+
+### To build:
+
+Prerequisites (Unix only):
+
+    * Python 2.6 or 2.7
+    * GNU Make 3.81 or newer
+    * libexecinfo (FreeBSD and OpenBSD only)
+
+Unix/Macintosh:
+
+    ./configure
+    make
+    make install
+
+If your python binary is in a non-standard location or has a
+non-standard name, run the following instead:
+
+    export PYTHON=/path/to/python
+    $PYTHON ./configure
+    make
+    make install
+
+Windows:
+
+    vcbuild.bat
+
+### To run the tests:
+
+Unix/Macintosh:
+
+    make test
+
+Windows:
+
+    vcbuild.bat test
+
+### To build the documentation:
+
+    make doc
+
+### To read the documentation:
+
+    man doc/node.1
+
+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://joyeur.com/2010/12/10/installing-node-and-npm/)
+  - [list of modules](https://github.com/joyent/node/wiki/modules)
+  - [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)
+  - [community](https://github.com/joyent/node/wiki/Community)
+  - [contributing](https://github.com/joyent/node/wiki/Contributing)
+  - [big list of all the helpful wiki pages](https://github.com/joyent/node/wiki/_pages)
--- 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
@@ -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/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/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/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.sh
+++ b/benchmark/http.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+cd "$(dirname "$(dirname $0)")"
+
+if type sysctl &>/dev/null; then
+  # darwin and linux
+  sudo sysctl -w net.ipv4.ip_local_port_range="12000 65535"
+  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
+
+k=${KEEPALIVE}
+if [ "$k" = "no" ]; then
+  k=""
+else
+  k="-k"
+fi
+node=${NODE:-./node}
+
+$node benchmark/http_simple.js &
+npid=$!
+
+sleep 1
+
+if [ "$k" = "-k" ]; then
+  echo "using keepalive"
+fi
+
+for i in a a a a a a a a a a a a a a a a a a a a; do
+  ab $k -t 10 -c 100 http://127.0.0.1:8000/${TYPE:-bytes}/${LENGTH:-1024} \
+    2>&1 | grep Req | egrep -o '[0-9\.]+'
+done
+
+kill $npid
--- a/benchmark/http_bench.js
+++ b/benchmark/http_bench.js
@@ -0,0 +1,127 @@
+// 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 spawn = require('child_process').spawn;
+var cluster = require('cluster');
+var http = require('http');
+
+var options = {
+  mode: 'master',
+  host: '127.0.0.1',
+  port: 22344,
+  path: '/',
+  servers: 1,
+  clients: 1
+};
+
+for (var i = 2; i < process.argv.length; ++i) {
+  var args = process.argv[i].split('=', 2);
+  var key = args[0];
+  var val = args[1];
+  options[key] = val;
+}
+
+switch (options.mode) {
+case 'master': startMaster(); break;
+case 'server': startServer(); break;
+case 'client': startClient(); break;
+default: throw new Error('Bad mode: ' + options.mode);
+}
+
+process.title = 'http_bench[' + options.mode + ']';
+
+// monkey-patch the log functions so they include name + pid
+console.log = patch(console.log);
+console.trace = patch(console.trace);
+console.error = patch(console.error);
+
+function patch(fun) {
+  var prefix = process.title + '[' + process.pid + '] ';
+  return function() {
+    var args = Array.prototype.slice.call(arguments);
+    args[0] = prefix + args[0];
+    return fun.apply(console, args);
+  };
+}
+
+function startMaster() {
+  if (!cluster.isMaster) return startServer();
+
+  for (var i = ~~options.servers; i > 0; --i) cluster.fork();
+
+  for (var i = ~~options.clients; i > 0; --i) {
+    var cp = spawn(process.execPath, [__filename, 'mode=client']);
+    cp.stdout.pipe(process.stdout);
+    cp.stderr.pipe(process.stderr);
+  }
+}
+
+function startServer() {
+  http.createServer(onRequest).listen(options.port, options.host);
+
+  var body = Array(1024).join('x');
+  var headers = {'Content-Length': '' + body.length};
+
+  function onRequest(req, res) {
+    req.on('error', onError);
+    res.on('error', onError);
+    res.writeHead(200, headers);
+    res.end(body);
+  }
+
+  function onError(err) {
+    console.error(err.stack);
+  }
+}
+
+function startClient() {
+  // send off a bunch of concurrent requests
+  // TODO make configurable
+  sendRequest();
+  sendRequest();
+
+  function sendRequest() {
+    var req = http.request(options, onConnection);
+    req.on('error', onError);
+    req.end();
+  }
+
+  // add a little back-off to prevent EADDRNOTAVAIL errors, it's pretty easy
+  // to exhaust the available port range
+  function relaxedSendRequest() {
+    setTimeout(sendRequest, 1);
+  }
+
+  function onConnection(res) {
+    res.on('error', onError);
+    res.on('data', onData);
+    res.on('end', relaxedSendRequest);
+  }
+
+  function onError(err) {
+    console.error(err.stack);
+    relaxedSendRequest();
+  }
+
+  function onData(data) {
+    // this space intentionally left blank
+  }
+}
--- a/benchmark/http_server_lag.js
+++ b/benchmark/http_server_lag.js
@@ -0,0 +1,13 @@
+var http = require('http');
+var port = parseInt(process.env.PORT, 10) || 8000;
+var defaultLag = parseInt(process.argv[2], 10) || 100;
+
+http.createServer(function(req, res) {
+  res.writeHead(200, { 'content-type': 'text/plain',
+                       'content-length': '2' });
+
+  var lag = parseInt(req.url.split("/").pop(), 10) || defaultLag;
+  setTimeout(function() {
+    res.end('ok');
+  }, lag);
+}).listen(port, 'localhost');
--- a/benchmark/http_simple.js
+++ b/benchmark/http_simple.js
@@ -1,56 +1,128 @@
-libDir = node.path.join(node.path.dirname(__filename), "../lib");
-node.libraryPaths.unshift(libDir);
+var path = require('path'),
+    exec = require('child_process').exec,
+    http = require('http');

-node.mixin(require("/utils.js"));
-http = require("/http.js");
+var port = parseInt(process.env.PORT || 8000);

-fixed = ""
-for (var i = 0; i < 20*1024; i++) {
-  fixed += "C";
+console.log('pid ' + process.pid);
+
+var fixed = makeString(20 * 1024, 'C'),
+    storedBytes = {},
+    storedBuffer = {},
+    storedUnicode = {};
+
+var useDomains = process.env.NODE_USE_DOMAINS;
+
+// set up one global domain.
+if (useDomains) {
+  var domain = require('domain');
+  var gdom = domain.create();
+  gdom.on('error', function(er) {
+    console.log('Error on global domain', er);
+    throw er;
+  });
+  gdom.enter();
 }
-stored = {};
-http.createServer(function (req, res) {
-  var commands = req.uri.path.split("/");
+
+var server = http.createServer(function (req, res) {
+  if (useDomains) {
+    var dom = domain.create();
+    dom.add(req);
+    dom.add(res);
+  }
+
+  var commands = req.url.split('/');
  var command = commands[1];
-  var body = "";
+  var body = '';
  var arg = commands[2];
+  var n_chunks = parseInt(commands[3], 10);
  var status = 200;

-  p(req.uri.params);
-
-  if (command == "bytes") {
-    var n = parseInt(arg, 10)
+  if (command == 'bytes') {
+    var n = ~~arg;
    if (n <= 0)
-      throw "bytes called with n <= 0" 
-    if (stored[n] === undefined) {
-      puts("create stored[n]");
-      stored[n] = "";
+      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];
+
+  } else if (command == 'buffer') {
+    var n = ~~arg;
+    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++) {
-        stored[n] += "C"
+        storedBuffer[n][i] = 'C'.charCodeAt(0);
      }
    }
-    body = stored[n];
+    body = storedBuffer[n];

-  } else if (command == "quit") {
+  } else if (command == 'unicode') {
+    var n = ~~arg;
+    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];
+
+  } else if (command == 'quit') {
    res.connection.server.close();
-    body = "quitting";
+    body = 'quitting';

-  } else if (command == "fixed") {
+  } else if (command == 'fixed') {
    body = fixed;

+  } else if (command == 'echo') {
+    res.writeHead(200, { 'Content-Type': 'text/plain',
+                         'Transfer-Encoding': 'chunked' });
+    req.pipe(res);
+    return;
+
  } else {
    status = 404;
-    body = "not found\n";
+    body = 'not found\n';
  }

-  var content_length = body.length.toString();
+  // example: http://localhost:port/bytes/512/4
+  // sends a 512 byte body in 4 chunks of 128 bytes
+  if (n_chunks > 0) {
+    res.writeHead(status, { 'Content-Type': 'text/plain',
+                            'Transfer-Encoding': 'chunked' });
+    // send body in chunks
+    var len = body.length;
+    var step = Math.floor(len / n_chunks) || 1;

-  res.sendHeader( status 
-                , { "Content-Type": "text/plain"
-                  , "Content-Length": content_length
-                  }
-                );
-  res.sendBody(body);
-          
-  res.finish();
-}).listen(8000);
+    for (var i = 0, n = (n_chunks - 1); i < n; ++i) {
+      res.write(body.slice(i * step, i * step + step));
+    }
+    res.end(body.slice((n_chunks - 1) * step));
+  } else {
+    var content_length = body.length.toString();
+
+    res.writeHead(status, { 'Content-Type': 'text/plain',
+                            'Content-Length': content_length });
+    res.end(body);
+  }
+});
+
+function makeString(size, c) {
+  var s = '';
+  while (s.length < size) {
+    s += c;
+  }
+  return s;
+}
+
+server.listen(port, function () {
+  console.log('Listening at http://127.0.0.1:'+port+'/');
+});
+
+process.on('exit', function() {
+  console.error('libuv counters', process.uvCounters());
+});
--- a/benchmark/http_simple.rb
+++ b/benchmark/http_simple.rb
@@ -7,45 +7,45 @@ end

 def wait(seconds)
  n = (seconds / 0.01).to_i
-  n.times do 
+  n.times do
    sleep(0.01)
-    #File.read(DIR + '/yahoo.html') 
+    #File.read(DIR + '/yahoo.html')
  end
 end

 class SimpleApp
  @@responses = {}
-  
+
  def initialize
    @count = 0
  end
-  
+
  def deferred?(env)
    false
  end
-  
+
  def call(env)
    path = env['PATH_INFO'] || env['REQUEST_URI']
    commands = path.split('/')
-    
+
    @count += 1
    if commands.include?('periodical_activity') and @count % 10 != 1
      return [200, {'Content-Type'=>'text/plain'}, "quick response!\r\n"]
    end
-    
+
    if commands.include?('fibonacci')
      n = commands.last.to_i
      raise "fibonacci called with n <= 0" if n <= 0
      body = (1..n).to_a.map { |i| fib(i).to_s }.join(' ')
      status = 200
-    
+
    elsif commands.include?('wait')
      n = commands.last.to_f
      raise "wait called with n <= 0" if n <= 0
      wait(n)
      body = "waited about #{n} seconds"
      status = 200
-    
+
    elsif commands.include?('bytes')
      n = commands.last.to_i
      raise "bytes called with n <= 0" if n <= 0
@@ -56,17 +56,17 @@ class SimpleApp
      n = 20 * 1024;
      body = @@responses[n] || "C"*n
      status = 200
-      
+
    elsif commands.include?('test_post_length')
      input_body = ""
      while chunk = env['rack.input'].read(512)
-        input_body << chunk 
+        input_body << chunk
      end
      if env['CONTENT_LENGTH'].to_i == input_body.length
        body = "Content-Length matches input length"
        status = 200
      else
-        body = "Content-Length doesn't matches input length! 
+        body = "Content-Length doesn't matches input length!
          content_length = #{env['CONTENT_LENGTH'].to_i}
          input_body.length = #{input_body.length}"
        status = 500
@@ -75,7 +75,7 @@ class SimpleApp
      status = 404
      body = "Undefined url"
    end
-    
+
    body += "\r\n"
    headers = {'Content-Type' => 'text/plain', 'Content-Length' => body.length.to_s }
    [status, headers, [body]]
@@ -90,6 +90,6 @@ if $0 == __FILE__
  require 'thin'
  require 'ebb'
 #  Rack::Handler::Mongrel.run(SimpleApp.new, :Port => 8000)
-  Thin::Server.start("0.0.0.0", 8000, SimpleApp.new) 
+  Thin::Server.start("0.0.0.0", 8000, SimpleApp.new)
 #  Ebb::start_server(SimpleApp.new, :port => 8000)
 end
--- a/benchmark/http_simple_auto.js
+++ b/benchmark/http_simple_auto.js
@@ -0,0 +1,127 @@
+//
+// Usage:
+//   node benchmark/http_simple_auto.js <args> <target>
+//
+// Where:
+//   <args>   Arguments to pass to `ab`.
+//   <target> Target to benchmark, e.g. `bytes/1024` or `buffer/8192`.
+//
+
+var path = require("path");
+var http = require("http");
+var spawn = require("child_process").spawn;
+
+var port = parseInt(process.env.PORT || 8000);
+
+var fixed = ""
+for (var i = 0; i < 20*1024; i++) {
+  fixed += "C";
+}
+
+var stored = {};
+var storedBuffer = {};
+
+var server = http.createServer(function (req, res) {
+  var commands = req.url.split("/");
+  var command = commands[1];
+  var body = "";
+  var arg = commands[2];
+  var n_chunks = parseInt(commands[3], 10);
+  var status = 200;
+
+  if (command == "bytes") {
+    var n = parseInt(arg, 10)
+    if (n <= 0)
+      throw "bytes called with n <= 0"
+    if (stored[n] === undefined) {
+      stored[n] = "";
+      for (var i = 0; i < n; i++) {
+        stored[n] += "C"
+      }
+    }
+    body = stored[n];
+
+  } else if (command == "buffer") {
+    var n = parseInt(arg, 10)
+    if (n <= 0) throw new Error("bytes called with n <= 0");
+    if (storedBuffer[n] === undefined) {
+      storedBuffer[n] = new Buffer(n);
+      for (var i = 0; i < n; i++) {
+        storedBuffer[n][i] = "C".charCodeAt(0);
+      }
+    }
+    body = storedBuffer[n];
+
+  } else if (command == "quit") {
+    res.connection.server.close();
+    body = "quitting";
+
+  } else if (command == "fixed") {
+    body = fixed;
+
+  } else if (command == "echo") {
+    res.writeHead(200, { "Content-Type": "text/plain",
+                         "Transfer-Encoding": "chunked" });
+    req.pipe(res);
+    return;
+
+  } else {
+    status = 404;
+    body = "not found\n";
+  }
+
+  // example: http://localhost:port/bytes/512/4
+  // sends a 512 byte body in 4 chunks of 128 bytes
+  if (n_chunks > 0) {
+    res.writeHead(status, { "Content-Type": "text/plain",
+                            "Transfer-Encoding": "chunked" });
+    // send body in chunks
+    var len = body.length;
+    var step = Math.floor(len / n_chunks) || 1;
+
+    for (var i = 0, n = (n_chunks - 1); i < n; ++i) {
+      res.write(body.slice(i * step, i * step + step));
+    }
+    res.end(body.slice((n_chunks - 1) * step));
+  } else {
+    var content_length = body.length.toString();
+
+    res.writeHead(status, { "Content-Type": "text/plain",
+                            "Content-Length": content_length });
+    res.end(body);
+  }
+
+});
+
+server.listen(port, function () {
+  var url = 'http://127.0.0.1:' + port + '/';
+
+  var n = process.argv.length - 1;
+  process.argv[n] = url + process.argv[n];
+
+  var cp = spawn('ab', process.argv.slice(2));
+  cp.stdout.pipe(process.stdout);
+  cp.stderr.pipe(process.stderr);
+  cp.on('exit', function() {
+    server.close();
+    process.nextTick(dump_mm_stats);
+  });
+});
+
+function dump_mm_stats() {
+  if (typeof gc != 'function') return;
+
+  var before = process.memoryUsage();
+  for (var i = 0; i < 10; ++i) gc();
+  var after = process.memoryUsage();
+  setTimeout(print_stats, 250); // give GC time to settle
+
+  function print_stats() {
+    console.log('\nBEFORE / AFTER GC');
+    ['rss', 'heapTotal', 'heapUsed'].forEach(function(key) {
+      var a = before[key] / (1024 * 1024);
+      var b = after[key] / (1024 * 1024);
+      console.log('%sM / %sM %s', a.toFixed(2), b.toFixed(2), key);
+    });
+  }
+}
--- a/benchmark/http_simple_bench.sh
+++ b/benchmark/http_simple_bench.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+SERVER=127.0.0.1
+PORT=8000
+
+# You may want to configure your TCP settings to make many ports available
+# to node and ab. On macintosh use: 
+#   sudo sysctl -w net.inet.ip.portrange.first=32768
+#   sudo sysctl -w net.inet.tcp.msl=1000
+
+if [ ! -d benchmark/ ]; then
+  echo "Run this script from the node root directory"
+  exit 1
+fi
+
+if [ $SERVER == "127.0.0.1" ]; then
+  ./node benchmark/http_simple.js &
+  node_pid=$!
+  sleep 1
+fi
+
+info=`curl -s http://$SERVER:$PORT/info`
+eval $info
+
+date=`date "+%Y%m%d%H%M%S"`
+
+ab_hello_world() {
+  local type="$1"
+  local ressize="$2"
+  if [ $type == "string" ]; then 
+    local uri="bytes/$ressize"
+  else
+    local uri="buffer/$ressize"
+  fi
+
+
+  name="ab-hello-world-$type-$ressize"
+
+  dir=".benchmark_reports/$name/$rev/"
+  if [ ! -d $dir ]; then
+    mkdir -p $dir
+  fi
+
+  summary_fn="$dir/$date.summary"
+  data_fn="$dir/$date.data"
+
+  echo "Bench $name starts in 3 seconds..."
+  # let shit calm down
+  sleep 3
+
+  # hammer that as hard as it can for 10 seconds.
+  ab -g $data_fn -c 100 -t 10 http://$SERVER:$PORT/$uri > $summary_fn
+
+  # add our data about the server
+  echo >> $summary_fn
+  echo >> $summary_fn
+  echo "webserver-rev: $rev" >> $summary_fn
+  echo "webserver-uname: $uname" >> $summary_fn
+
+  grep Req $summary_fn 
+
+  echo "Summary: $summary_fn"
+  echo
+}
+
+# 1k
+ab_hello_world 'string' '1024'
+ab_hello_world 'buffer' '1024'
+
+# 100k 
+ab_hello_world 'string' '102400'
+ab_hello_world 'buffer' '102400'
+
+
+if [ ! -z $node_pid ]; then
+  kill -9 $node_pid
+fi
--- a/benchmark/http_simple_cluster.js
+++ b/benchmark/http_simple_cluster.js
@@ -0,0 +1,9 @@
+var cluster = require('cluster');
+var os = require('os');
+
+if (cluster.isMaster) {
+  console.log('master running on pid %d', process.pid);
+  for (var i = 0, n = os.cpus().length; i < n; ++i) cluster.fork();
+} else {
+  require(__dirname + '/http_simple.js');
+}
--- a/benchmark/idle_clients.js
+++ b/benchmark/idle_clients.js
@@ -0,0 +1,49 @@
+net = require('net');
+
+var errors = 0, connections = 0;
+
+var lastClose = 0;
+
+function connect () {
+  process.nextTick(function () {
+    var s = net.Stream();
+    var gotConnected = false;
+    s.connect(9000);
+
+    s.on('connect', function () {
+      gotConnected = true;
+      connections++;
+      connect();
+    });
+
+    s.on('close', function () {
+      if (gotConnected) connections--;
+      lastClose = new Date();
+    });
+
+    s.on('error', function () {
+      errors++;
+    });
+  });
+}
+
+connect();
+
+
+var oldConnections, oldErrors;
+
+// Try to start new connections every so often
+setInterval(connect, 5000);
+
+setInterval(function () {
+  if (oldConnections != connections) {
+    oldConnections = connections;
+    console.log("CLIENT %d connections: %d", process.pid, connections);
+  }
+
+  if (oldErrors != errors) {
+    oldErrors = errors;
+    console.log("CLIENT %d errors: %d", process.pid, errors);
+  }
+}, 1000);
+
--- a/benchmark/idle_server.js
+++ b/benchmark/idle_server.js
@@ -0,0 +1,31 @@
+net = require('net');
+connections = 0;
+
+var errors = 0;
+
+server = net.Server(function (socket) {
+
+  socket.on('error', function () {
+    errors++; 
+  });
+
+});
+
+//server.maxConnections = 128;
+
+server.listen(9000);
+
+var oldConnections, oldErrors;
+
+setInterval(function () {
+  if (oldConnections != server.connections) {
+    oldConnections = server.connections;
+    console.log("SERVER %d connections: %d", process.pid, server.connections);
+  }
+
+  if (oldErrors != errors) {
+    oldErrors = errors;
+    console.log("SERVER %d errors: %d", process.pid, errors);
+  }
+}, 1000);
+
--- a/benchmark/io.c
+++ b/benchmark/io.c
@@ -0,0 +1,122 @@
+/**
+ * gcc -o iotest io.c
+ */
+
+#include <assert.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+ 
+static int c = 0;
+static int tsize = 1000 * 1048576;
+static const char path[] = "/tmp/wt.dat";
+static char buf[65536];
+
+static uint64_t now(void) {
+  struct timeval tv;
+
+  if (gettimeofday(&tv, NULL))
+    abort();
+
+  return tv.tv_sec * 1000000ULL + tv.tv_usec;
+}
+
+static void writetest(int size, size_t bsize)
+{
+  int i;
+  uint64_t start, end;
+  double elapsed;
+  double mbps;
+
+  assert(bsize <= sizeof buf);
+
+  int fd = open(path, O_CREAT|O_WRONLY, 0644);
+  if (fd < 0) {
+    perror("open failed");
+    exit(254);
+  }
+
+  start = now();
+
+  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);
+    }
+  }
+
+#ifndef NSYNC
+# ifdef __linux__
+  fdatasync(fd);
+# else
+  fsync(fd);
+# endif
+#endif /* SYNC */
+
+  close(fd);
+
+  end = now();
+  elapsed = (end - start) / 1e6;
+  mbps = ((tsize/elapsed)) / 1048576;
+
+  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)
+{
+  int i;
+  uint64_t start, end;
+  double elapsed;
+  double mbps;
+
+  assert(bsize <= sizeof buf);
+
+  int fd = open(path, O_RDONLY, 0644);
+  if (fd < 0) {
+    perror("open failed");
+    exit(254);
+  }
+
+  start = now();
+
+  for (i = 0; i < size; i += bsize) {
+    int rv = read(fd, buf, bsize);
+    if (rv < 0) {
+      perror("write failed");
+      exit(254);
+    }
+  }
+  close(fd);
+
+  end = now();
+  elapsed = (end - start) / 1e6;
+  mbps = ((tsize/elapsed)) / 1048576;
+
+  fprintf(stderr, "Read %d bytes in %03fs using %ld byte buffers: %03fmB/s\n", size, elapsed, bsize, mbps);
+}
+
+void cleanup() {
+  unlink(path);
+}
+
+int main()
+{
+  int i;
+  int bsizes[] = {1024, 4096, 8192, 16384, 32768, 65536, 0};
+
+  for (i = 0; bsizes[i] != 0; i++) {
+    writetest(tsize, bsizes[i]);
+  }
+  for (i = 0; bsizes[i] != 0; i++) {
+    readtest(tsize, bsizes[i]);
+  }
+  atexit(cleanup);
+  return 0;
+}
--- 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/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/plot.R
+++ b/benchmark/plot.R
@@ -0,0 +1,86 @@
+#!/usr/bin/env Rscript
+
+# To use this script you'll need to install R: http://www.r-project.org/
+# and a library for R called ggplot2 
+# Which can be done by starting R and typing install.packages("ggplot2")
+# like this:
+#
+#     shell% R
+#     R version 2.11.0 beta (2010-04-12 r51689)
+#     >  install.packages("ggplot2")
+#     (follow prompt) 
+#
+# Then you can try this script by providing a full path to .data file
+# outputed from 'make bench'
+#
+#     > cd ~/src/node
+#     > make bench
+#     ...
+#     > ./benchmark/plot.R .benchmark_reports/ab-hello-world-buffer-1024/ff456b38862de3fd0118c6ac6b3f46edb1fbb87f/20101013162056.data
+#     
+# This will generate a PNG file which you can view
+#
+#
+# Hopefully these steps will be automated in the future.
+
+
+
+library(ggplot2)
+
+args <- commandArgs(TRUE)
+
+ab.load <- function (filename, name) {
+  raw <- data.frame(read.csv(filename, sep="\t", header=T), server=name)
+  raw <- data.frame(raw, time=raw$seconds-min(raw$seconds))
+  raw <- data.frame(raw, time_s=raw$time/1000000)
+  raw
+}
+
+#ab.tsPoint <- function (d) {
+#  qplot(time_s, ttime, data=d, facets=server~.,
+#        geom="point", alpha=I(1/15), ylab="response time (ms)",
+#        xlab="time (s)", main="c=30, res=26kb", 
+#        ylim=c(0,100))
+#}
+#
+#ab.tsLine <- function (d) {
+#  qplot(time_s, ttime, data=d, facets=server~.,
+#        geom="line", ylab="response time (ms)",
+#        xlab="time (s)", main="c=30, res=26kb", 
+#        ylim=c(0,100))
+#}
+
+
+filename <- args[0:1]
+data <- ab.load(filename, "node")
+
+
+# histogram
+
+#hist_png_filename <- gsub(".data", "_hist.png", filename)
+hist_png_filename <- "hist.png"
+
+png(filename = hist_png_filename, width = 480, height = 380, units = "px")
+
+qplot(ttime, data=data, geom="histogram",
+      main="xxx",
+      binwidth=1, xlab="response time (ms)",
+      xlim=c(0,100))
+
+print(hist_png_filename)
+
+
+
+# time series
+
+#ts_png_filename <- gsub(".data", "_ts.png", filename)
+ts_png_filename = "ts.png"
+
+png(filename = ts_png_filename, width = 480, height = 380, units = "px")
+
+qplot(time, ttime, data=data, facets=server~.,
+      geom="point", alpha=I(1/15), ylab="response time (ms)",
+      xlab="time (s)", main="xxx",
+      ylim=c(0,100))
+
+print(ts_png_filename)
--- a/benchmark/process_loop.js
+++ b/benchmark/process_loop.js
@@ -1,13 +1,13 @@
-libDir = node.path.join(node.path.dirname(__filename), "../lib");
-node.libraryPaths.unshift(libDir);
-node.mixin(require("/utils.js"));
+var util = require("util"),
+    childProcess = require("child_process");
+
 function next (i) {
  if (i <= 0) return;

-  var child = node.createChildProcess("echo", ["hello"]);
+  var child = childProcess.spawn("echo", ["hello"]);

-  child.addListener("output", function (chunk) {
-    if (chunk) print(chunk);
+  child.stdout.addListener("data", function (chunk) {
+    util.print(chunk);
  });

  child.addListener("exit", function (code) {
--- a/benchmark/report-startup-memory.js
+++ b/benchmark/report-startup-memory.js
@@ -0,0 +1 @@
+console.log(process.memoryUsage().rss);
--- a/benchmark/run.js
+++ b/benchmark/run.js
@@ -1,16 +1,16 @@
-libDir = node.path.join(node.path.dirname(__filename), "../lib");
-node.libraryPaths.unshift(libDir);
-node.mixin(require("/utils.js"));
-var benchmarks = [ "static_http_server.js" 
-                 , "timers.js"
+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 benchmark_dir = node.path.dirname(__filename);
+var benchmarkDir = path.dirname(__filename);

 function exec (script, callback) {
  var start = new Date();
-  var child = node.createChildProcess(ARGV[0], [node.path.join(benchmark_dir, script)]);
+  var child = childProcess.spawn(process.argv[0], [path.join(benchmarkDir, script)]);
  child.addListener("exit", function (code) {
    var elapsed = new Date() - start;
    callback(elapsed, code);
@@ -19,12 +19,12 @@ function exec (script, callback) {

 function runNext (i) {
  if (i >= benchmarks.length) return;
-  print(benchmarks[i] + ": ");
+  util.print(benchmarks[i] + ": ");
  exec(benchmarks[i], function (elapsed, code) {
    if (code != 0) {
-      puts("ERROR  ");
+      console.log("ERROR  ");
    }
-    puts(elapsed);
+    console.log(elapsed);
    runNext(i+1);
  });
 };
--- 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
@@ -1,45 +1,43 @@
-libDir = node.path.join(node.path.dirname(__filename), "../lib");
-node.libraryPaths.unshift(libDir);
-http = require("/http.js");
+var http = require('http');
+
 var concurrency = 30;
-var port = 8000;
+var port = 12346;
 var n = 700;
 var bytes = 1024*5;

 var requests = 0;
 var responses = 0;

-var body = "";
+var body = '';
 for (var i = 0; i < bytes; i++) {
-  body += "C";
+  body += 'C';
 }

-var server = http.createServer(function (req, res) {
-  res.sendHeader(200, {
-    "Content-Type": "text/plain",
-    "Content-Length": body.length
+var server = http.createServer(function(req, res) {
+  res.writeHead(200, {
+    'Content-Type': 'text/plain',
+    'Content-Length': body.length
  });
-  res.sendBody(body);
-  res.finish();
+  res.end(body);
 })
-server.listen(port);

-function responseListener (res) {
-  res.addListener("complete", function () {
-    if (requests < n) {
-      res.client.get("/").finish(responseListener);
-      requests++;
-    }
+server.listen(port, function() {
+  var agent = new http.Agent();
+  agent.maxSockets = concurrency;

-    if (++responses == n) {
-      server.close();
-    }
-  });
-}
-
-for (var i = 0; i < concurrency; i++) {
-  var client = http.createClient(port);
-  client.id = i;
-  client.get("/").finish(responseListener);
-  requests++;
-}
+  for (var i = 0; i < n; i++) {
+    var req = http.get({
+      port:  port,
+      path:  '/',
+      agent: agent
+    }, function(res) {
+      res.on('end', function() {
+        if (++responses === n) {
+          server.close();
+        }
+      });
+    });
+    req.id = i;
+    requests++;
+  }
+});
--- 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/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/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/bin/node-repl
+++ b/bin/node-repl
@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-
-node.mixin(require("/utils.js"));
-puts("Welcome to the Node.js REPL.");
-puts("Enter ECMAScript at the prompt.");
-puts("Tip 1: Use 'rlwrap node-repl' for a better interface");
-puts("Tip 2: Type Control-D to exit.");
-
-require("/repl.js").start();
-
-// vim:ft=javascript
--- a/common.gypi
+++ b/common.gypi
@@ -0,0 +1,225 @@
+{
+  'variables': {
+    '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,
+
+    # Turn on optimizations that may trigger compiler bugs.
+    # Use at your own risk. Do *NOT* report bugs if this option is enabled.
+    'node_unsafe_optimizations%': 0,
+
+    # Enable V8's post-mortem debugging only on unix flavors.
+    'conditions': [
+      ['OS != "win"', {
+        'v8_postmortem_support': 'true'
+      }]
+    ],
+  },
+
+  'target_defaults': {
+    'default_configuration': 'Release',
+    'configurations': {
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'cflags': [ '-g', '-O0' ],
+        'conditions': [
+          ['target_arch=="x64"', {
+            'msvs_configuration_platform': 'x64',
+          }],
+        ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 1, # static debug
+            'Optimization': 0, # /Od, no optimization
+            'MinimalRebuild': 'false',
+            'OmitFramePointers': 'false',
+            'BasicRuntimeChecks': 3, # /RTC1
+          },
+          'VCLinkerTool': {
+            'LinkIncremental': 2, # enable incremental linking
+          },
+        },
+      },
+      'Release': {
+        'conditions': [
+          ['target_arch=="x64"', {
+            'msvs_configuration_platform': 'x64',
+          }],
+          ['node_unsafe_optimizations==1', {
+            'cflags': [ '-O3', '-ffunction-sections', '-fdata-sections' ],
+            'ldflags': [ '-Wl,--gc-sections' ],
+          }, {
+            'cflags': [ '-O2', '-fno-strict-aliasing' ],
+            'cflags!': [ '-O3', '-fstrict-aliasing' ],
+            'conditions': [
+              # Required by the dtrace post-processor. Unfortunately,
+              # some gcc/binutils combos generate bad code when
+              # -ffunction-sections is enabled. Let's hope for the best.
+              ['OS=="solaris"', {
+                'cflags': [ '-ffunction-sections', '-fdata-sections' ],
+              }, {
+                'cflags!': [ '-ffunction-sections', '-fdata-sections' ],
+              }],
+              ['clang == 0 and gcc_version >= 40', {
+                'cflags': [ '-fno-tree-vrp' ],
+              }],
+              ['clang == 0 and gcc_version <= 44', {
+                'cflags': [ '-fno-tree-sink' ],
+              }],
+            ],
+          }],
+          ['OS=="solaris"', {
+            'cflags': [ '-fno-omit-frame-pointer' ],
+            # pull in V8's postmortem metadata
+            'ldflags': [ '-Wl,-z,allextract' ]
+          }],
+        ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 0, # static 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',
+            'RuntimeTypeInfo': 'false',
+            'ExceptionHandling': '0',
+            'AdditionalOptions': [
+              '/MP', # compile across multiple CPUs
+            ],
+          },
+          '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',
+      },
+      'VCLibrarianTool': {
+      },
+      'VCLinkerTool': {
+        'conditions': [
+          ['target_arch=="x64"', {
+            'TargetMachine' : 17 # /MACHINE:X64
+          }],
+        ],
+        'GenerateDebugInformation': 'true',
+        'RandomizedBaseAddress': 2, # enable ASLR
+        'DataExecutionPrevention': 2, # enable DEP
+        'AllowIsolation': 'true',
+        'SuppressStartupBanner': 'true',
+        'target_conditions': [
+          ['_type=="executable"', {
+            'SubSystem': 1, # console executable
+          }],
+        ],
+      },
+    },
+    'conditions': [
+      ['OS == "win"', {
+        'msvs_cygwin_shell': 0, # prevent actions from trying to use cygwin
+        'defines': [
+          'WIN32',
+          # we don't really 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',
+          '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', '-pthread', ],
+        'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
+        'ldflags': [ '-pthread', '-rdynamic' ],
+        'conditions': [
+          [ 'target_arch=="ia32"', {
+            'cflags': [ '-m32' ],
+            'ldflags': [ '-m32' ],
+          }],
+          [ 'target_arch=="x64"', {
+            'cflags': [ '-m64' ],
+            'ldflags': [ '-m64' ],
+          }],
+          [ 'OS=="solaris"', {
+            'cflags': [ '-pthreads' ],
+            'ldflags': [ '-pthreads' ],
+            'cflags!': [ '-pthread' ],
+            'ldflags!': [ '-pthread' ],
+          }],
+        ],
+      }],
+      ['OS=="mac"', {
+        'defines': ['_DARWIN_USE_64_BIT_INODE=1'],
+        'xcode_settings': {
+          'ALWAYS_SEARCH_USER_PATHS': 'NO',
+          'GCC_CW_ASM_SYNTAX': 'NO',                # No -fasm-blocks
+          'GCC_DYNAMIC_NO_PIC': 'NO',               # No -mdynamic-no-pic
+                                                    # (Equivalent to -fPIC)
+          'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',        # -fno-exceptions
+          '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',
+          'OTHER_CFLAGS': [
+            '-fno-strict-aliasing',
+          ],
+          'WARNING_CFLAGS': [
+            '-Wall',
+            '-Wendif-labels',
+            '-W',
+            '-Wno-unused-parameter',
+          ],
+        },
+        'target_conditions': [
+          ['_type!="static_library"', {
+            'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
+          }],
+        ],
+        'conditions': [
+          ['target_arch=="ia32"', {
+            'xcode_settings': {'ARCHS': ['i386']},
+          }],
+          ['target_arch=="x64"', {
+            'xcode_settings': {'ARCHS': ['x86_64']},
+          }],
+        ],
+      }],
+    ],
+  }
+}
--- a/513
+++ b/513
@@ -1,16 +1,507 @@
-#! /bin/sh
+#!/usr/bin/env python
+import optparse
+import os
+import pprint
+import re
+import subprocess
+import sys

-CUR_DIR=$PWD
+CC = os.environ.get('CC', 'cc')

-#possible relative path
-WORKINGDIR=`dirname $0`
-cd $WORKINGDIR
-#abs path
-WORKINGDIR=`pwd`
-cd $CUR_DIR
+root_dir = os.path.dirname(__file__)
+sys.path.insert(0, os.path.join(root_dir, 'deps', 'v8', 'tools'))

-WAF="${WORKINGDIR}/tools/waf-light"
+# parse our options
+parser = optparse.OptionParser()

-"${WAF}" configure $*
+parser.add_option("--debug",
+    action="store_true",
+    dest="debug",
+    help="Also build debug build")

-exit $?
+parser.add_option("--prefix",
+    action="store",
+    dest="prefix",
+    help="Select the install prefix (defaults to /usr/local)")
+
+parser.add_option("--without-npm",
+    action="store_true",
+    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",
+    help="Build without SSL")
+
+parser.add_option("--without-snapshot",
+    action="store_true",
+    dest="without_snapshot",
+    help="Build without snapshotting V8 libraries. You might want to set"
+         " this for cross-compiling. [Default: False]")
+
+parser.add_option("--shared-v8",
+    action="store_true",
+    dest="shared_v8",
+    help="Link to a shared V8 DLL instead of static linking")
+
+parser.add_option("--shared-v8-includes",
+    action="store",
+    dest="shared_v8_includes",
+    help="Directory containing V8 header files")
+
+parser.add_option("--shared-v8-libpath",
+    action="store",
+    dest="shared_v8_libpath",
+    help="A directory to search for the shared V8 DLL")
+
+parser.add_option("--shared-v8-libname",
+    action="store",
+    dest="shared_v8_libname",
+    help="Alternative lib name to link to (default: 'v8')")
+
+parser.add_option("--shared-openssl",
+    action="store_true",
+    dest="shared_openssl",
+    help="Link to a shared OpenSSl DLL instead of static linking")
+
+parser.add_option("--shared-openssl-includes",
+    action="store",
+    dest="shared_openssl_includes",
+    help="Directory containing OpenSSL header files")
+
+parser.add_option("--shared-openssl-libpath",
+    action="store",
+    dest="shared_openssl_libpath",
+    help="A directory to search for the shared OpenSSL DLLs")
+
+parser.add_option("--shared-openssl-libname",
+    action="store",
+    dest="shared_openssl_libname",
+    help="Alternative lib name to link to (default: 'crypto,ssl')")
+
+# deprecated
+parser.add_option("--openssl-use-sys",
+    action="store_true",
+    dest="shared_openssl",
+    help=optparse.SUPPRESS_HELP)
+
+# deprecated
+parser.add_option("--openssl-includes",
+    action="store",
+    dest="shared_openssl_includes",
+    help=optparse.SUPPRESS_HELP)
+
+# deprecated
+parser.add_option("--openssl-libpath",
+    action="store",
+    dest="shared_openssl_libpath",
+    help=optparse.SUPPRESS_HELP)
+
+parser.add_option("--no-ssl2",
+    action="store_true",
+    dest="no_ssl2",
+    help="Disable OpenSSL v2")
+
+parser.add_option("--shared-zlib",
+    action="store_true",
+    dest="shared_zlib",
+    help="Link to a shared zlib DLL instead of static linking")
+
+parser.add_option("--shared-zlib-includes",
+    action="store",
+    dest="shared_zlib_includes",
+    help="Directory containing zlib header files")
+
+parser.add_option("--shared-zlib-libpath",
+    action="store",
+    dest="shared_zlib_libpath",
+    help="A directory to search for the shared zlib DLL")
+
+parser.add_option("--shared-zlib-libname",
+    action="store",
+    dest="shared_zlib_libname",
+    help="Alternative lib name to link to (default: 'z')")
+
+parser.add_option("--with-dtrace",
+    action="store_true",
+    dest="with_dtrace",
+    help="Build with DTrace (default is true on supported systems)")
+
+parser.add_option("--without-dtrace",
+    action="store_true",
+    dest="without_dtrace",
+    help="Build without DTrace")
+
+parser.add_option("--with-etw",
+    action="store_true",
+    dest="with_etw",
+    help="Build with ETW (default is true on Windows)")
+
+parser.add_option("--without-etw",
+    action="store_true",
+    dest="without_etw",
+    help="Build without ETW")
+
+# CHECKME does this still work with recent releases of V8?
+parser.add_option("--gdb",
+    action="store_true",
+    dest="gdb",
+    help="add gdb support")
+
+parser.add_option("--dest-cpu",
+    action="store",
+    dest="dest_cpu",
+    help="CPU architecture to build for. Valid values are: arm, ia32, x64")
+
+parser.add_option("--dest-os",
+    action="store",
+    dest="dest_os",
+    help="Operating system to build for. Valid values are: "
+         "win, mac, solaris, freebsd, linux")
+
+parser.add_option("--no-ifaddrs",
+    action="store_true",
+    dest="no_ifaddrs",
+    help="Use on deprecated SunOS systems that do not support ifaddrs.h")
+
+parser.add_option("--with-arm-float-abi",
+    action="store",
+    dest="arm_float_abi",
+    help="Specifies which floating-point ABI to use. Valid values are: "
+         "soft, softfp, hard")
+
+# Using --unsafe-optimizations voids your warranty.
+parser.add_option("--unsafe-optimizations",
+    action="store_true",
+    dest="unsafe_optimizations",
+    help=optparse.SUPPRESS_HELP)
+
+parser.add_option("--tag",
+    action="store",
+    dest="tag",
+    help="Custom build tag")
+
+(options, args) = parser.parse_args()
+
+
+def b(value):
+  """Returns the string 'true' if value is truthy, 'false' otherwise."""
+  if value:
+    return 'true'
+  else:
+    return 'false'
+
+
+def pkg_config(pkg):
+  cmd = os.popen('pkg-config --libs %s' % pkg, 'r')
+  libs = cmd.readline().strip()
+  ret = cmd.close()
+  if (ret): return None
+
+  cmd = os.popen('pkg-config --cflags %s' % pkg, 'r')
+  cflags = cmd.readline().strip()
+  ret = cmd.close()
+  if (ret): return None
+
+  return (libs, cflags)
+
+
+def cc_macros():
+  """Checks predefined macros using the CC command."""
+
+  try:
+    p = subprocess.Popen(CC.split() + ['-dM', '-E', '-'],
+                         stdin=subprocess.PIPE,
+                         stdout=subprocess.PIPE,
+                         stderr=subprocess.PIPE)
+  except OSError:
+    print '''Node.js configure error: No acceptable C compiler found!
+
+        Please make sure you have a C compiler installed on your system and/or
+        consider adjusting the CC environment variable if you installed
+        it in a non-standard prefix.
+        '''
+    sys.exit()
+
+  p.stdin.write('\n')
+  out = p.communicate()[0]
+
+  out = str(out).split('\n')
+
+  k = {}
+  for line in out:
+    import shlex
+    lst = shlex.split(line)
+    if len(lst) > 2:
+      key = lst[1]
+      val = lst[2]
+      k[key] = val
+  return k
+
+
+def is_arch_armv7():
+  """Check for ARMv7 instructions"""
+  cc_macros_cache = cc_macros()
+  return ('__ARM_ARCH_7__' in cc_macros_cache or
+          '__ARM_ARCH_7A__' in cc_macros_cache or
+          '__ARM_ARCH_7R__' in cc_macros_cache or
+          '__ARM_ARCH_7M__' in cc_macros_cache)
+
+
+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
+  # the Floating Point ABI used (PCS stands for Procedure Call Standard).
+  # We use these as well as a couple of other defines to statically determine
+  # what FP ABI used.
+  # GCC versions 4.4 and below don't support hard-fp.
+  # GCC versions 4.5 may support hard-fp without defining __ARM_PCS or
+  # __ARM_PCS_VFP.
+
+  if compiler_version() >= (4, 6, 0):
+    return '__ARM_PCS_VFP' in cc_macros()
+  elif compiler_version() < (4, 5, 0):
+    return False
+  elif '__ARM_PCS_VFP' in cc_macros():
+    return True
+  elif ('__ARM_PCS' in cc_macros() or
+        '__SOFTFP' in cc_macros() or
+        not '__VFP_FP__' in cc_macros()):
+    return False
+  else:
+    print '''Node.js configure error: Your version of GCC does not report
+      the Floating-Point ABI to compile for your hardware
+
+      Please manually specify which floating-point ABI to use with the
+      --with-arm-float-abi option.
+      '''
+    sys.exit()
+
+
+def host_arch_cc():
+  """Host architecture check using the CC command."""
+
+  k = cc_macros()
+
+  matchup = {
+    '__x86_64__'  : 'x64',
+    '__i386__'    : 'ia32',
+    '__arm__'     : 'arm',
+  }
+
+  rtn = 'ia32' # default
+
+  for i in matchup:
+    if i in k and k[i] != '0':
+      rtn = matchup[i]
+      break
+
+  return rtn
+
+
+def host_arch_win():
+  """Host architecture check using environ vars (better way to do this?)"""
+
+  arch = os.environ.get('PROCESSOR_ARCHITECTURE', 'x86')
+
+  matchup = {
+    'AMD64'  : 'x64',
+    'x86'    : 'ia32',
+    'arm'    : 'arm',
+  }
+
+  return matchup.get(arch, 'ia32')
+
+
+def compiler_version():
+  try:
+    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(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE)
+  version = tuple(map(int, proc.communicate()[0].split('.')))
+
+  return (version, is_clang)
+
+
+def configure_arm(o):
+  # V8 on ARM requires that armv7 is set. CPU Model detected by
+  # the presence of __ARM_ARCH_7__ and the like defines in compiler
+  if options.arm_float_abi:
+    hard_float = options.arm_float_abi == 'hard'
+  else:
+    hard_float = arm_hard_float_abi()
+  o['variables']['v8_use_arm_eabi_hardfloat'] = b(hard_float)
+
+  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):
+  # 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'
+
+  host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
+  target_arch = options.dest_cpu or host_arch
+  o['variables']['host_arch'] = host_arch
+  o['variables']['target_arch'] = target_arch
+
+  if target_arch == 'arm':
+    configure_arm(o)
+
+  cc_version, is_clang = compiler_version()
+  o['variables']['clang'] = 1 if is_clang else 0
+
+  if not is_clang and 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):
+    o['variables']['visibility'] = ''
+
+  # By default, enable DTrace on SunOS systems. Don't allow it on other
+  # systems, since it won't work.  (The MacOS build process is different than
+  # SunOS, and we haven't implemented it.)
+  if sys.platform.startswith('sunos'):
+    o['variables']['node_use_dtrace'] = b(not options.without_dtrace)
+  elif b(options.with_dtrace) == 'true':
+    raise Exception('DTrace is currently only supported on SunOS systems.')
+  else:
+    o['variables']['node_use_dtrace'] = 'false'
+
+  if options.no_ifaddrs:
+    o['defines'] += ['SUNOS_NO_IFADDRS']
+
+  # By default, enable ETW on Windows.
+  if sys.platform.startswith('win32'):
+    o['variables']['node_use_etw'] = b(not options.without_etw);
+  elif b(options.with_etw) == 'true':
+    raise Exception('ETW is only supported on Windows.')
+  else:
+    o['variables']['node_use_etw'] = 'false'
+
+  if options.tag:
+    o['variables']['node_tag'] = '-' + options.tag
+  else:
+    o['variables']['node_tag'] = ''
+
+
+def configure_libz(o):
+  o['variables']['node_shared_zlib'] = b(options.shared_zlib)
+
+  # assume shared_zlib if one of these is set?
+  if options.shared_zlib_libpath:
+    o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
+  if options.shared_zlib_libname:
+    o['libraries'] += ['-l%s' % options.shared_zlib_libname]
+  elif options.shared_zlib:
+    o['libraries'] += ['-lz']
+  if options.shared_zlib_includes:
+    o['include_dirs'] += [options.shared_zlib_includes]
+
+
+def configure_v8(o):
+  o['variables']['v8_use_snapshot'] = b(not options.without_snapshot)
+  o['variables']['node_shared_v8'] = b(options.shared_v8)
+
+  # assume shared_v8 if one of these is set?
+  if options.shared_v8_libpath:
+    o['libraries'] += ['-L%s' % options.shared_v8_libpath]
+  if options.shared_v8_libname:
+    o['libraries'] += ['-l%s' % options.shared_v8_libname]
+  elif options.shared_v8:
+    o['libraries'] += ['-lv8']
+  if options.shared_v8_includes:
+    o['include_dirs'] += [options.shared_v8_includes]
+
+
+def configure_openssl(o):
+  o['variables']['node_use_openssl'] = b(not options.without_ssl)
+  o['variables']['node_shared_openssl'] = b(options.shared_openssl)
+
+  if options.without_ssl:
+    return
+
+  if options.no_ssl2:
+    o['defines'] += ['OPENSSL_NO_SSL2=1']
+
+  if options.shared_openssl:
+    (libs, cflags) = pkg_config('openssl') or ('-lssl -lcrypto', '')
+
+    if options.shared_openssl_libpath:
+      o['libraries'] += ['-L%s' % options.shared_openssl_libpath]
+
+    if options.shared_openssl_libname:
+      libnames = options.shared_openssl_libname.split(',')
+      o['libraries'] += ['-l%s' % s for s in libnames]
+    else:
+      o['libraries'] += libs.split()
+
+    if options.shared_openssl_includes:
+      o['include_dirs'] += [options.shared_openssl_includes]
+    else:
+      o['cflags'] += cflags.split()
+
+
+output = {
+  'variables': {},
+  'include_dirs': [],
+  'libraries': [],
+  'defines': [],
+  'cflags': [],
+}
+
+configure_node(output)
+configure_libz(output)
+configure_v8(output)
+configure_openssl(output)
+
+# variables should be a root level element,
+# move everything else to target_defaults
+variables = output['variables']
+del output['variables']
+output = {
+  'variables': variables,
+  'target_defaults': output
+}
+pprint.pprint(output, indent=2)
+
+def write(filename, data):
+  filename = os.path.join(root_dir, filename)
+  print "creating ", filename
+  f = open(filename, 'w+')
+  f.write(data)
+
+write('config.gypi', "# Do not edit. Generated by the configure script.\n" +
+  pprint.pformat(output, indent=2) + "\n")
+
+write('config.mk', "# Do not edit. Generated by the configure script.\n" +
+  ("BUILDTYPE=%s\n" % ('Debug' if options.debug else 'Release')))
+
+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']
+
+subprocess.call([sys.executable, 'tools/gyp_node'] + gyp_args)
--- a/deps/coupling/Makefile
+++ b/deps/coupling/Makefile
@@ -1,33 +0,0 @@
-# CFLAGS and LDFLAGS are for the users to override from the command line.
-CFLAGS	= -g -I. -Wall -Werror -Wextra #-DNDEBUG=1
-LDFLAGS	= -pthread
-
-CC = gcc
-AR = ar
-RANLIB = ranlib
-
-DEP = coupling.h
-SRC = coupling.c
-OBJ = ${SRC:.c=.o}
-
-NAME=libcoupling
-OUTPUT_A=$(NAME).a
-
-all: $(OUTPUT_A) 
-
-$(OUTPUT_A): $(OBJ)
-	$(AR) cru $(OUTPUT_A) $(OBJ)
-	$(RANLIB) $(OUTPUT_A)
-
-.c.o:
-	$(CC) -c ${CFLAGS} $<
-
-${OBJ}: ${DEP}
-
-test: test.c $(OUTPUT_A)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ test.c $(OUTPUT_A)
-
-clean:
-	rm -f $(OUTPUT_A) *.o test
-
-.PHONY: all clean 
--- a/deps/coupling/coupling.c
+++ b/deps/coupling/coupling.c
@@ -1,337 +0,0 @@
-/* Copyright (c) 2009 Ryan Dahl (ry@tinyclouds.org)
- *
- * All rights reserved.
- * 
- * 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. 
- */
-#include "coupling.h"
-
-#include <sys/types.h> 
-#include <sys/uio.h>
-#include <sys/select.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <assert.h>
-
-#include <pthread.h>
-
-#ifdef PIPE_BUF
-# define BUFSIZE  PIPE_BUF
-#else
-# define BUFSIZE  4096
-#endif
-
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
-// ring buffer
-typedef struct {
-  int head;
-  int tail;
-  int size;
-  char buf[BUFSIZE]; 
-} ring_buffer; 
-
-static inline void
-ring_buffer_inspect (ring_buffer *ring)
-{
-  printf("size %5d  head %5d  tail %5d\n", ring->size, ring->head, ring->tail);
-}
-
-static inline void
-ring_buffer_init (ring_buffer *ring)
-{
-  ring->head = 0;
-  ring->tail = 0;
-  ring->size = 0;
-}
-
-static inline int
-ring_buffer_filled_p (ring_buffer *ring)
-{
-  assert(BUFSIZE - (long)ring->size >= 0);
-  return (BUFSIZE == ring->size);
-}
-
-static inline int
-ring_buffer_empty_p (ring_buffer *ring)
-{
-  return 0 == ring->size;
-}
-
-static ssize_t
-ring_buffer_pull (ring_buffer *ring, int fd)
-{
-  // DO NOT CALL WHEN FILLED
-  assert(!ring_buffer_filled_p(ring));
-
-  struct iovec iov[2];
-  int iovcnt = 1;
-
-  // Very tough logic. Can you follow? Barely can I.
-  iov[0].iov_base = ring->buf + ring->tail;
-  if (ring->tail < ring->head) {
-    iov[0].iov_len = ring->head - ring->tail;
-  } else {
-    iov[0].iov_len = BUFSIZE - ring->tail;
-    if (ring->head != 0) {
-      iovcnt = 2; 
-      iov[1].iov_base = ring->buf;
-      iov[1].iov_len = ring->head;
-    }
-  }
-
-  int r = readv(fd, iov, iovcnt);
-
-  if (r > 0) {
-    ring->size += r;
-    ring->tail = (ring->tail + r) % BUFSIZE;
-  }
-  assert(ring->size <= BUFSIZE);
-
-  return r;
-}
-
-static ssize_t
-ring_buffer_push (ring_buffer *ring, int fd)
-{
-  // DO NOT CALL WHEN EMPTY
-  assert(!ring_buffer_empty_p(ring));
-
-  struct iovec iov[2];
-  int iovcnt = 1;
-
-  iov[0].iov_base = ring->buf + ring->head;
-  if (ring->head < ring->tail) {
-    iov[0].iov_len = ring->tail - ring->head;
-  } else {
-    iov[0].iov_len = BUFSIZE - ring->head;
-    if (ring->tail != 0) {
-      iovcnt = 2; 
-      iov[1].iov_base = ring->buf;
-      iov[1].iov_len = ring->tail;
-    }
-  }
-
-  int r = writev(fd, iov, iovcnt);
-
-  if (r > 0) {
-    ring->size -= r;
-    ring->head = (ring->head + r) % BUFSIZE;
-  }
-  assert(0 <= (long)ring->size);
-
-  return r;
-}
-
-static void
-pump (int is_pull, int pullfd, int pushfd)
-{
-  int r;
-  ring_buffer ring;
-  fd_set readfds, writefds, exceptfds;
-
-  ring_buffer_init(&ring);
-
-  int maxfd;
-
-  while (pushfd >= 0 && (pullfd >= 0 || !ring_buffer_empty_p(&ring))) {
-    FD_ZERO(&exceptfds);
-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    
-    maxfd = -1;
-    
-    if (is_pull) {
-      if (!ring_buffer_empty_p(&ring)) { 
-        maxfd = pushfd;
-        FD_SET(pushfd, &exceptfds);
-        FD_SET(pushfd, &writefds);
-      }
-    } else {
-      if (pullfd >= 0) {
-        if (!ring_buffer_filled_p(&ring)) {
-          maxfd = pullfd;
-          FD_SET(pullfd, &exceptfds);
-          FD_SET(pullfd, &readfds);
-        }
-      }
-    }
-
-    if (maxfd >= 0) {
-      r = select(maxfd+1, &readfds, &writefds, &exceptfds, NULL);
-
-      if (r < 0 || (pullfd >= 0 && FD_ISSET(pushfd, &exceptfds))) {
-        close(pushfd);
-        close(pullfd);
-        pushfd = pullfd = -1;
-        return;
-      }
-    }
-
-    if (pullfd >= 0 && FD_ISSET(pullfd, &exceptfds)) {
-      close(pullfd);
-      pullfd = -1;
-    }
-
-    if (pullfd >= 0 && (is_pull || FD_ISSET(pullfd, &readfds))) {
-      r = ring_buffer_pull(&ring, pullfd);
-      if (r == 0) {
-        /* eof */
-        close(pullfd);
-        pullfd = -1;
-
-      } else if (r < 0) {
-        if (errno != EINTR && errno != EAGAIN) goto error;
-      }
-    }
-
-    if (!is_pull || FD_ISSET(pushfd, &writefds)) {
-      r = ring_buffer_push(&ring, pushfd);
-      if (r < 0) {
-        switch (errno) {
-          case EINTR:
-          case EAGAIN:
-            continue;
-
-          case EPIPE:
-            /* TODO catch SIGPIPE? */
-            close(pushfd);
-            close(pullfd);
-            pushfd = pullfd = -1;
-            return;
-
-          default:
-            goto error;
-        }
-      }
-    }
-  }
-
-  close(pushfd);
-  close(pullfd);
-  return;
-
-error:
-  close(pushfd);
-  close(pullfd);
-  perror("(coupling) pump");
-}
-
-static inline int
-set_nonblock (int fd)
-{
-  int flags = fcntl(fd, F_GETFL, 0);
-  if (flags == -1) return -1;
-
-  int r = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-  if (r == -1) return -1;
-
-  return 0;
-}
-
-struct coupling {
-  int is_pull;
-  int pullfd;
-  int pushfd;
-  int exposedfd;
-  pthread_t tid;
-};
-
-static void *
-pump_thread (void *data)
-{
-  struct coupling *c = (struct coupling*)data;
-
-  pump(c->is_pull, c->pullfd, c->pushfd);
-
-  return NULL;
-}
-
-static struct coupling*
-create_coupling (int fd, int is_pull)
-{
-  int pipefd[2];
-
-  struct coupling *c = malloc(sizeof(struct coupling));
-  if (!c) return NULL;
-  
-  int r = pipe(pipefd);
-  if (r < 0) return NULL;
-
-  r = set_nonblock(pipefd[0]);
-  if (r < 0) return NULL;
-  assert(pipefd[0] >= 0);
-
-  r = set_nonblock(pipefd[1]);
-  if (r < 0) return NULL;
-  assert(pipefd[1] >= 0);
-
-  if (is_pull) {
-    c->is_pull = 1;
-    c->pullfd = fd;
-    c->pushfd = pipefd[1];
-    c->exposedfd = pipefd[0];
-  } else {
-    c->is_pull = 0;
-    c->pushfd = fd;
-    c->pullfd = pipefd[0];
-    c->exposedfd = pipefd[1];
-  }
-
-  r = pthread_create(&c->tid, NULL, pump_thread, c);
-  if (r < 0) return NULL;
-
-  return c;
-}
-
-struct coupling*
-coupling_new_pull (int fd)
-{
-  return create_coupling(fd, 1);
-}
-
-struct coupling*
-coupling_new_push (int fd)
-{
-  return create_coupling(fd, 0);
-}
-
-int 
-coupling_nonblocking_fd (struct coupling *c)
-{
-  return c->exposedfd;
-}
-
-void 
-coupling_join (struct coupling *c)
-{
-  int r = pthread_join(c->tid, NULL);
-  assert(r == 0);
-}
-
-void
-coupling_destroy (struct coupling *c)
-{
-  close(c->is_pull ? c->pushfd : c->pullfd);
-  free(c);
-}
--- a/deps/coupling/coupling.h
+++ b/deps/coupling/coupling.h
@@ -1,42 +0,0 @@
-/* Copyright (c) 2009 Ryan Dahl (ry@tinyclouds.org)
- *
- * All rights reserved.
- * 
- * 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. 
- */
-#ifndef coupling_h
-#define coupling_h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct coupling;
-
-struct coupling*  coupling_new_pull       (int fd);
-struct coupling*  coupling_new_push       (int fd);
-             int  coupling_nonblocking_fd (struct coupling*);
-            void  coupling_join           (struct coupling*);
-            void  coupling_destroy        (struct coupling*);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- a/deps/coupling/test.c
+++ b/deps/coupling/test.c
@@ -1,73 +0,0 @@
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/select.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include "coupling.h"
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define CHUNKSIZE 44231
-
-int
-main (int argc, char *argv[])
-{
-  struct coupling *c = coupling_new_push(STDERR_FILENO);
-  int stderr_fd = coupling_nonblocking_fd(c);
-
-  int size;
-  if (argc == 2) {
-    size = atoi(argv[1]);
-    printf("size = %d\n", size);
-  } else {
-    printf("usage: ./test 123 2> stderr; wc -c stderr\n");
-    exit(1);
-  }
-
-  char *msg = malloc(CHUNKSIZE);
-  int i, r;
-  for (i = 0; i < CHUNKSIZE; i++) {
-    msg[i] = 'A' + i % 26;
-  }
-
-  int written = 0;
-
-  fd_set writefds, exceptfds;
-
-  FD_ZERO(&exceptfds);
-  FD_SET(stderr_fd, &exceptfds);
-
-  FD_ZERO(&writefds);
-  FD_SET(stderr_fd, &writefds);
-
-  while (written < size) {
-    r = select(stderr_fd+1, NULL, &writefds, &exceptfds, NULL);
-    if (r < 0) {
-      printf("test.c select(): %s\n", strerror(errno));
-      exit(1);
-    }
-    
-    if (FD_ISSET(stderr_fd, &exceptfds)) {
-      printf("exception on stderr fd\n"); 
-      exit(1);
-    }
-    
-    if (FD_ISSET(stderr_fd, &writefds)) {
-      r = write(stderr_fd, msg, MIN(size - written, CHUNKSIZE));
-      if (r < 0 && errno != EAGAIN) {
-        printf("test.c write(): %s\n", strerror(errno));
-        exit(1);
-      } else {
-        written += r;
-        printf("%d\n", written);
-      }
-    }
-  }
-
-  close(stderr_fd);
-  coupling_join(c);
-  coupling_destroy(c);
-
-  return 0;
-}
--- a/deps/evcom/Makefile
+++ b/deps/evcom/Makefile
@@ -1,75 +0,0 @@
-# Define EVDIR=/foo/bar if your libev header and library files are in
-# /foo/bar/include and /foo/bar/lib directories.
-EVDIR=$(HOME)/local/libev
-
-# Define GNUTLSDIR=/foo/bar if your gnutls header and library files are in
-# /foo/bar/include and /foo/bar/lib directories.
-#
-# Comment out the following line to disable TLS
-GNUTLSDIR=/usr
-
-# CFLAGS and LDFLAGS are for the users to override from the command line.
-CFLAGS	= -g -I. -Wall -Werror -Wextra #-DNDEBUG=1
-LDFLAGS	=
-
-CC = gcc
-AR = ar
-RANLIB = ranlib
-
-ifdef EVDIR
-	CFLAGS += -I$(EVDIR)/include
-	LDFLAGS += -L$(EVDIR)/lib
-endif
-
-LDFLAGS += -lev
-
-ifdef GNUTLSDIR
-	CFLAGS += -I$(GNUTLSDIR)/include -DEVCOM_HAVE_GNUTLS=1
-	LDFLAGS += -L$(GNUTLSDIR)/lib
-	LDFLAGS += -lgnutls
-endif
-
-DEP = evcom.h
-SRC = evcom.c
-OBJ = ${SRC:.c=.o}
-
-NAME=libevcom
-OUTPUT_A=$(NAME).a
-
-all: $(OUTPUT_A) test/test test/echo
-
-$(OUTPUT_A): $(OBJ)
-	$(AR) cru $(OUTPUT_A) $(OBJ)
-	$(RANLIB) $(OUTPUT_A)
-
-.c.o:
-	$(CC) -c ${CFLAGS} $<
-
-${OBJ}: ${DEP}
-
-FAIL=ruby -e 'puts "\033[1;31m FAIL\033[m"'
-PASS=ruby -e 'puts "\033[1;32m PASS\033[m"'
-
-test: test/test test/echo test/timeout.rb
-	@echo test.c
-	@test/test > /dev/null && $(PASS) || $(FAIL)
-	@echo timeout.rb
-	@test/timeout.rb
-
-test/test: test/test.c $(OUTPUT_A)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ test/test.c $(OUTPUT_A)
-
-test/echo: test/echo.c $(OUTPUT_A)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ test/echo.c $(OUTPUT_A)
-
-send_states.png: send_states.dot
-	dot -Tpng -o send_states.png send_states.dot
-
-recv_states.png: recv_states.dot
-	dot -Tpng -o recv_states.png recv_states.dot
-
-clean:
-	rm -rf test/test test/echo
-	rm -f $(OUTPUT_A) *.o
-
-.PHONY: all clean test
--- a/deps/evcom/evcom.c
+++ b/deps/evcom/evcom.c
--- a/deps/evcom/evcom.h
+++ b/deps/evcom/evcom.h
@@ -1,259 +0,0 @@
-/* Copyright (c) 2008,2009 Ryan Dahl
- *
- * evcom_queue comes from Nginx, ngx_queue.h
- * Copyright (C) 2002-2009 Igor Sysoev
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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.
- */
-#include <netdb.h>
-#include <ev.h>
-#include <stddef.h> /* offsetof() */
-
-#ifndef evcom_h
-#define evcom_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef EVCOM_HAVE_GNUTLS
-# define EVCOM_HAVE_GNUTLS 0
-#endif
-#if EVCOM_HAVE_GNUTLS
-# include <gnutls/gnutls.h>
-#endif
-
-/* The maximum evcom_stream will try to read in one callback */
-#ifndef EVCOM_CHUNKSIZE
-# define EVCOM_CHUNKSIZE (8*1024)
-#endif
-
-/* flags for stream and server */
-#define EVCOM_ATTACHED          0x0001
-#define EVCOM_LISTENING         0x0002
-#define EVCOM_CONNECTED         0x0004
-#define EVCOM_SECURE            0x0008
-#define EVCOM_DUPLEX            0x0010
-#define EVCOM_GOT_CLOSE         0x0020
-#define EVCOM_PAUSED            0x0040
-#define EVCOM_READABLE          0x0080
-#define EVCOM_WRITABLE          0x0100
-#define EVCOM_TOO_MANY_CONN     0x0200
-
-enum evcom_stream_state { EVCOM_INITIALIZED
-                        , EVCOM_CONNECTING
-                        , EVCOM_CONNECTED_RW /* read write */
-                        , EVCOM_CONNECTED_RO /* read only  */
-                        , EVCOM_CONNECTED_WO /* write only */
-                        , EVCOM_CLOSING
-                        , EVCOM_CLOSED
-                        };
-
-typedef struct evcom_queue {
-  struct evcom_queue  *prev;
-  struct evcom_queue  *next;
-} evcom_queue;
-
-typedef struct evcom_buf {
-  /* public */
-  char *base;
-  size_t len;
-  void (*release) (struct evcom_buf *); /* called when oi is done with the object */
-  void *data;
-
-  /* private */
-  size_t written;
-  evcom_queue queue;
-} evcom_buf;
-
-#if EV_MULTIPLICITY
-#  define EVCOM_LOOP struct ev_loop *loop;
-#else
-#  define EVCOM_LOOP
-#endif
-
-#define EVCOM_DESCRIPTOR(type)                                \
-  /* private   */  unsigned int flags;                        \
-  /* private   */  int (*action) (struct evcom_descriptor*);  \
-  /* read-only */  int errorno;                               \
-  /* read-only */  int fd;                                    \
-  /* read-only */  EVCOM_LOOP                                 \
-  /* public    */  void *data;                                \
-  /* public    */  void (*on_close) (struct type*);
-
-/* abstract base class */
-typedef struct evcom_descriptor {
-  EVCOM_DESCRIPTOR(evcom_descriptor)
-} evcom_descriptor;
-
-typedef struct evcom_reader {
-  EVCOM_DESCRIPTOR(evcom_reader)
-  ev_io read_watcher; /* private */
-  void (*on_read) (struct evcom_reader*, const void* buf, size_t len); /* public */
-} evcom_reader;
-
-typedef struct evcom_writer {
-  EVCOM_DESCRIPTOR(evcom_writer)
-  ev_io write_watcher; /* private */
-  evcom_queue out; /* private */
-} evcom_writer;
-
-typedef struct evcom_stream {
-  /* PRIVATE */
-  EVCOM_LOOP
-  int errorno;
-  unsigned int flags;
-  evcom_queue out;
-  ev_io read_watcher;
-  ev_io write_watcher;
-  int (*send_action) (struct evcom_stream*);
-  int (*recv_action) (struct evcom_stream*);
-  ev_timer timeout_watcher;
-#if EVCOM_HAVE_GNUTLS
-  gnutls_session_t session;
-#endif
-
-  /* READ-ONLY */
-  int recvfd;
-  int sendfd;
-  struct evcom_server *server;
-#if EVCOM_HAVE_GNUTLS
-  int gnutls_errorno;
-#endif
-
-  /* PUBLIC */
-  void (*on_connect) (struct evcom_stream *);
-  void (*on_timeout) (struct evcom_stream *);
-  void (*on_read)    (struct evcom_stream *, const void* buf, size_t len);
-  void (*on_close)   (struct evcom_stream *);
-  void *data;
-} evcom_stream;
-
-typedef struct evcom_server {
-  EVCOM_DESCRIPTOR(evcom_server)
-
-  /* PRIVATE */
-  ev_io watcher;
-
-  /* PUBLIC */
-  struct evcom_stream*
-    (*on_connection)(struct evcom_server *, struct sockaddr *remote_addr);
-} evcom_server;
-
-/* Highly recommended to ignore SIGPIPE! */
-void evcom_ignore_sigpipe (void);
-
-void evcom_reader_init          (evcom_reader*);
-void evcom_reader_set           (evcom_reader*, int fd);
-void evcom_reader_attach        (EV_P_ evcom_reader*);
-void evcom_reader_detach        (evcom_reader*);
-void evcom_reader_close         (evcom_reader*);
-
-void evcom_writer_init          (evcom_writer*);
-void evcom_writer_set           (evcom_writer*, int fd);
-void evcom_writer_attach        (EV_P_ evcom_writer*);
-void evcom_writer_detach        (evcom_writer*);
-void evcom_writer_write         (evcom_writer*, const char *str, size_t len);
-void evcom_writer_close         (evcom_writer*);
-
-void evcom_server_init          (evcom_server *);
- int evcom_server_listen        (evcom_server *, struct sockaddr *address, int backlog);
-void evcom_server_attach        (EV_P_ evcom_server *);
-void evcom_server_detach        (evcom_server *);
-void evcom_server_close         (evcom_server *);
-
-void evcom_stream_init          (evcom_stream *);
-
- int evcom_stream_pair          (evcom_stream *a, evcom_stream *b);
- int evcom_stream_connect       (evcom_stream *, struct sockaddr *address);
-void evcom_stream_assign_fds    (evcom_stream *, int recvfd, int sendfd);
-
-void evcom_stream_attach        (EV_P_ evcom_stream *);
-void evcom_stream_detach        (evcom_stream *);
-void evcom_stream_read_resume   (evcom_stream *);
-void evcom_stream_read_pause    (evcom_stream *);
-void evcom_stream_reset_timeout (evcom_stream *, float timeout);
-void evcom_stream_set_no_delay  (evcom_stream *, int no_delay);
-void evcom_stream_write         (evcom_stream *, const char *str, size_t len);
-/* Once the write buffer is drained, evcom_stream_close will shutdown the
- * writing end of the stream and will close the read end once the server
- * replies with an EOF.
- */
-void evcom_stream_close         (evcom_stream *);
-
-/* Will not wait for the write queue to complete. Closes both directions */
-void evcom_stream_force_close   (evcom_stream *);
-
-
-#if EVCOM_HAVE_GNUTLS
-/* Tells the stream to use transport layer security (SSL). evcom_stream does
- * not want to make any decisions about security requirements, so the
- * majoirty of GnuTLS configuration is left to the user. Only the transport
- * layer of GnuTLS is controlled by evcom_stream. That is, do not use
- * gnutls_transport_* functions.  Do use the rest of GnuTLS's API.
- */
-void evcom_stream_set_secure_session (evcom_stream *, gnutls_session_t);
-#endif
-
-enum evcom_stream_state evcom_stream_state (evcom_stream *stream);
-
-evcom_buf* evcom_buf_new     (const char* base, size_t len);
-evcom_buf* evcom_buf_new2    (size_t len);
-
-EV_INLINE void
-evcom_queue_init (evcom_queue *q)
-{
-  q->prev = q;
-  q->next = q;
-}
-
-EV_INLINE void
-evcom_queue_insert_head (evcom_queue *h, evcom_queue *x)
-{
-  (x)->next = (h)->next;
-  (x)->next->prev = x;
-  (x)->prev = h;
-  (h)->next = x;
-}
-
-EV_INLINE void
-evcom_queue_remove (evcom_queue *x)
-{
-  (x)->next->prev = (x)->prev;
-  (x)->prev->next = (x)->next;
-#ifndef NDEBUG
-  (x)->prev = NULL;
-  (x)->next = NULL;
-#endif
-}
-
-#define evcom_queue_empty(h) (h == (h)->prev)
-#define evcom_queue_head(h) (h)->next
-#define evcom_queue_last(h) (h)->prev
-#define evcom_queue_data(q, type, link) \
-    (type *) ((unsigned char *) q - offsetof(type, link))
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* evcom_h */
--- a/deps/evcom/recv_states.dot
+++ b/deps/evcom/recv_states.dot
@@ -1,37 +0,0 @@
-strict digraph recv_states {
-  start [peripheries=2];
-  end [peripheries=2];
-  handshake;
-  recv_data;
-  wait_for_resume;
-  wait_for_close;
-  close_one;
-  close_both;
-
-  node [label="", shape="box", height=0.1, width=0.1];
-  close;
-
-
-
-  start -> handshake [label="tls"];
-  start -> recv_data;
-
-  handshake -> close [label="error"];
-  handshake -> recv_data;
-
-  recv_data -> handshake [label="rehandshake"];
-  recv_data -> wait_for_resume [label="pause"];
-  recv_data -> wait_for_close [label="eof"];
-  recv_data -> close [label="error"];
-
-  wait_for_resume -> recv_data;
-
-  wait_for_close -> close;
-
-  close -> close_one [label="duplex"];
-  close -> close_both;
-
-  close_one -> end;
-  close_both -> end;
-  
-}
--- a/deps/evcom/send_states.dot
+++ b/deps/evcom/send_states.dot
@@ -1,65 +0,0 @@
-strict digraph send_states {
-  start [peripheries=2];
-  end [peripheries=2];
-  connection_established;
-  handshake;
-  send_data;
-  shutdown;
-  gnutls_bye;
-  close_one;
-  close_both;
-
-  wait_for_connect;
-  wait_for_buf;
-  wait_for_eof;
-
-  node [label="", shape="box", height=0.1, width=0.1];
-  close;
-  drain;
-  hangup;
-  hangup_unsecure;
-
-
-
-  start -> wait_for_connect [label="duplex"];
-  start -> connection_established;   
-
-  wait_for_connect -> connection_established;
-  wait_for_connect -> close [label="error"];
-
-  connection_established -> handshake [label="tls"];
-  connection_established -> send_data;
-
-  handshake -> close [label="error"];
-  handshake -> send_data;
-
-  send_data -> close [label="error"];
-  send_data -> drain [label="drain"];
-
-  drain -> wait_for_buf;
-  drain -> hangup [label="got_close"];
-
-  wait_for_buf -> send_data;
-  wait_for_buf -> drain [label="empty_buf"];
-
-  hangup -> gnutls_bye [label="tls"]; 
-  hangup -> hangup_unsecure;
-
-  gnutls_bye -> wait_for_eof;
-  gnutls_bye -> close [label="error"];
-
-  hangup_unsecure -> shutdown [label="duplex"];
-  hangup_unsecure -> close_one;
-
-  shutdown -> wait_for_eof;
-  shutdown -> close [label="error"];
-
-  wait_for_eof -> close_one;
-  close_one -> wait_for_eof [label="readable"];
-
-  close -> close_both;
-  close -> close_one [label="duplex"];
-
-  close_both -> end;
-  close_one -> end;
-}
--- a/deps/evcom/test/echo.c
+++ b/deps/evcom/test/echo.c
@@ -1,100 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-
-
-#include <ev.h>
-#include <evcom.h>
-#if EVCOM_HAVE_GNUTLS
-#  include <gnutls/gnutls.h>
-#endif
-
-#define HOST "127.0.0.1"
-#define SOCKFILE "/tmp/oi.sock"
-#define PORT 5000
-
-static int nconnections; 
-
-static void 
-on_peer_close (evcom_stream *stream)
-{
-  assert(stream->errorno == 0);
-  //printf("server connection closed\n");
-  free(stream);
-}
-
-static void 
-on_peer_timeout (evcom_stream *stream)
-{
-  assert(stream);
-  fprintf(stderr, "peer connection timeout\n");
-  assert(0);
-}
-
-
-
-// timeout must match the timeout in timeout.rb
-#define TIMEOUT 5.0
-
-static void 
-on_peer_read (evcom_stream *stream, const void *base, size_t len)
-{
-  if(len == 0) return;
-
-  evcom_stream_write(stream, base, len);
-}
-
-static evcom_stream* 
-on_server_connection (evcom_server *server, struct sockaddr *addr)
-{
-  assert(server);
-  assert(addr);
-
-  evcom_stream *stream = malloc(sizeof(evcom_stream));
-  evcom_stream_init(stream);
-  stream->on_read = on_peer_read;
-  stream->on_close = on_peer_close;
-  stream->on_timeout = on_peer_timeout;
-  evcom_stream_reset_timeout(stream, TIMEOUT);
-
-  nconnections++;
-
-
-  //printf("on server connection\n");
-
-  return stream;
-}
-
-int 
-main (void)
-{
-  int r;
-  evcom_server server;
-
-  //printf("sizeof(evcom_server): %d\n", sizeof(evcom_server));
-  //printf("sizeof(evcom_stream): %d\n", sizeof(evcom_stream));
-
-  evcom_server_init(&server);
-  server.on_connection = on_server_connection;
-
-  struct sockaddr_in address;
-  memset(&address, 0, sizeof(struct sockaddr_in));
-  address.sin_family = AF_INET;
-  address.sin_port = htons(PORT);
-  address.sin_addr.s_addr = INADDR_ANY;
-
-  r = evcom_server_listen(&server, (struct sockaddr*)&address, 10);
-  assert(r == 0);
-  evcom_server_attach(EV_DEFAULT_ &server);
-
-  ev_loop(EV_DEFAULT_ 0);
-
-  return 0;
-}
--- a/deps/evcom/test/test.c
+++ b/deps/evcom/test/test.c
@@ -1,892 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-
-#include <ev.h>
-#include <evcom.h>
-
-#if EVCOM_HAVE_GNUTLS
-# include <gnutls/gnutls.h>
-#endif
-
-#undef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
-#undef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
-#define MARK_PROGRESS(c,cur,max) \
-  if (cur % (MAX(max,50)/50) == 0) write(STDERR_FILENO, c, 1)
-
-#define SOCKFILE "/tmp/oi.sock"
-#define PORT 5000
-
-static evcom_server server;
-static int nconnections;
-static int use_tls;
-static int got_server_close;
-
-static void
-common_on_server_close (evcom_server *s)
-{
-  printf("server on_close\n");
-  assert(s == &server);
-  assert(s->errorno == 0);
-  got_server_close = 1;
-  evcom_server_detach(s);
-}
-
-static void
-common_on_peer_close (evcom_stream *stream)
-{
-  assert(EVCOM_CLOSED == evcom_stream_state(stream));
-  assert(stream->errorno == 0);
-  printf("server connection closed\n");
-#if EVCOM_HAVE_GNUTLS
-  assert(stream->gnutls_errorno == 0);
-  if (use_tls) gnutls_deinit(stream->session);
-#endif
-  evcom_stream_detach(stream);
-  free(stream);
-}
-
-static void
-common_on_client_timeout (evcom_stream *stream)
-{
-  assert(stream);
-  printf("client connection timeout\n");
-}
-
-static void
-common_on_peer_timeout (evcom_stream *stream)
-{
-  assert(stream);
-  fprintf(stderr, "peer connection timeout\n");
-  assert(0);
-}
-
-#if EVCOM_HAVE_GNUTLS
-#define DH_BITS 768
-static gnutls_anon_server_credentials_t server_credentials;
-const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
-static gnutls_dh_params_t dh_params;
-
-void anon_tls_server (evcom_stream *stream)
-{
-  gnutls_session_t session;
-  stream->data = session;
-
-  int r = gnutls_init(&session, GNUTLS_SERVER);
-  assert(r == 0);
-  gnutls_set_default_priority(session);
-  gnutls_kx_set_priority (session, kx_prio);
-  gnutls_credentials_set(session, GNUTLS_CRD_ANON, server_credentials);
-  gnutls_dh_set_prime_bits(session, DH_BITS);
-
-  evcom_stream_set_secure_session(stream, session);
-}
-
-void anon_tls_client (evcom_stream *stream)
-{
-  gnutls_session_t client_session;
-  gnutls_anon_client_credentials_t client_credentials;
-
-  gnutls_anon_allocate_client_credentials (&client_credentials);
-  gnutls_init(&client_session, GNUTLS_CLIENT);
-  gnutls_set_default_priority(client_session);
-  gnutls_kx_set_priority(client_session, kx_prio);
-  /* Need to enable anonymous KX specifically. */
-  gnutls_credentials_set(client_session, GNUTLS_CRD_ANON, client_credentials);
-
-  evcom_stream_set_secure_session(stream, client_session);
-  assert(stream->flags & EVCOM_SECURE);
-}
-
-#endif // EVCOM_HAVE_GNUTLS
-
-
-
-
-
-#define PING "PING"
-#define PONG "PONG"
-#define EXCHANGES 500
-#define PINGPONG_TIMEOUT 5.0
-
-static int successful_ping_count;
-
-static void
-pingpong_on_peer_read (evcom_stream *stream, const void *base, size_t len)
-{
-  if (len == 0) {
-    evcom_stream_close(stream);
-    return;
-  }
-
-  char buf[2000];
-  strncpy(buf, base, len);
-  buf[len] = 0;
-  printf("server got message: %s\n", buf);
-
-  evcom_stream_write(stream, PONG, sizeof PONG);
-}
-
-static void
-pingpong_on_client_close (evcom_stream *stream)
-{
-  assert(EVCOM_CLOSED == evcom_stream_state(stream));
-  assert(stream);
-  printf("client connection closed\n");
-  evcom_server_close(&server);
-  evcom_stream_detach(stream);
-}
-
-static evcom_stream*
-pingpong_on_server_connection (evcom_server *_server, struct sockaddr *addr)
-{
-  assert(_server == &server);
-  assert(addr);
-
-  evcom_stream *stream = malloc(sizeof(evcom_stream));
-  evcom_stream_init(stream);
-  stream->on_read = pingpong_on_peer_read;
-  stream->on_close = common_on_peer_close;
-  stream->on_timeout = common_on_peer_timeout;
-  evcom_stream_reset_timeout(stream, PINGPONG_TIMEOUT);
-
-  assert(EVCOM_INITIALIZED == evcom_stream_state(stream));
-
-  nconnections++;
-
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_server(stream);
-#endif
-
-  printf("on server connection\n");
-
-  return stream;
-}
-
-static void
-pingpong_on_client_connect (evcom_stream *stream)
-{
-  printf("client connected. sending ping\n");
-  evcom_stream_write(stream, PING, sizeof PING);
-  assert(EVCOM_CONNECTED_RW == evcom_stream_state(stream));
-}
-
-static void
-pingpong_on_client_read (evcom_stream *stream, const void *base, size_t len)
-{
-  if(len == 0) {
-    evcom_stream_close(stream);
-    return;
-  }
-
-  assert(len = strlen(PONG));
-
-  char buf[len+1];
-  strncpy(buf, base, len);
-  buf[len] = 0;
-  printf("client got message: %s\n", buf);
-
-  assert(strcmp(buf, PONG) == 0);
-
-  if (++successful_ping_count > EXCHANGES) {
-    evcom_stream_close(stream);
-    return;
-  }
-
-  MARK_PROGRESS(".", successful_ping_count, EXCHANGES);
-
-  evcom_stream_write(stream, PING, sizeof PING);
-}
-
-int
-pingpong (struct sockaddr *address)
-{
-  int r;
-  evcom_stream client;
-
-  successful_ping_count = 0;
-  nconnections = 0;
-  got_server_close = 0;
-
-  evcom_server_init(&server);
-  server.on_connection = pingpong_on_server_connection;
-  server.on_close = common_on_server_close;
-
-  r = evcom_server_listen(&server, address, 10);
-  assert(r == 0);
-  evcom_server_attach(EV_DEFAULT_ &server);
-
-  evcom_stream_init(&client);
-  client.on_read    = pingpong_on_client_read;
-  client.on_connect = pingpong_on_client_connect;
-  client.on_close   = pingpong_on_client_close;
-  client.on_timeout = common_on_client_timeout;
-  evcom_stream_reset_timeout(&client, PINGPONG_TIMEOUT);
-
-  assert(EVCOM_INITIALIZED == evcom_stream_state(&client));
-
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_client(&client);
-#endif
-
-  r = evcom_stream_connect(&client, address);
-  assert(r == 0 && "problem connecting");
-  evcom_stream_attach(EV_DEFAULT_ &client);
-
-  ev_loop(EV_DEFAULT_ 0);
-
-  printf("successful_ping_count = %d\n", successful_ping_count);
-  assert(successful_ping_count == EXCHANGES + 1);
-  assert(nconnections == 1);
-  assert(got_server_close);
-
-  return 0;
-}
-
-
-
-#define NCONN 50
-#define CONNINT_TIMEOUT 10.0
-
-static void
-send_bye_and_close(evcom_stream *stream, const void *base, size_t len)
-{
-  assert(base);
-  assert(len == 0);
-  evcom_stream_write(stream, "BYE", 3);
-  printf("server wrote bye\n");
-  evcom_stream_close(stream);
-}
-
-static evcom_stream*
-connint_on_connection(evcom_server *_server, struct sockaddr *addr)
-{
-  assert(_server == &server);
-  assert(addr);
-
-  evcom_stream *stream = malloc(sizeof(evcom_stream));
-  evcom_stream_init(stream);
-  stream->on_read    = send_bye_and_close;
-  stream->on_close   = common_on_peer_close;
-  stream->on_timeout = common_on_peer_timeout;
-  evcom_stream_reset_timeout(stream, CONNINT_TIMEOUT);
-
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_server(stream);
-#endif
-
-  printf("on server connection\n");
-
-  return stream;
-}
-
-static void
-connint_on_client_connect (evcom_stream *stream)
-{
-  printf("on client connection\n");
-  evcom_stream_close(stream);
-}
-
-static void
-connint_on_client_close (evcom_stream *stream)
-{
-  evcom_stream_close(stream); // already closed, but it shouldn't crash if we try to do it again
-
-  printf("client connection closed\n");
-
-  MARK_PROGRESS(".", nconnections, NCONN);
-
-  if(++nconnections == NCONN) {
-    evcom_server_close(&server);
-    printf("closing server\n");
-  }
-
-  evcom_stream_detach(stream);
-}
-
-static void
-connint_on_client_read (evcom_stream *stream, const void *base, size_t len)
-{
-  if (len == 0) {
-    evcom_stream_close(stream);
-    return;
-  }
-
-  char buf[200000];
-  strncpy(buf, base, len);
-  buf[len] = 0;
-
-  printf("client got message: %s\n", buf);
-
-  assert(strcmp(buf, "BYE") == 0);
-  evcom_stream_close(stream);
-}
-
-int
-connint (struct sockaddr *address)
-{
-  int r;
-
-  nconnections = 0;
-  got_server_close = 0;
-
-  evcom_server_init(&server);
-  server.on_connection = connint_on_connection;
-  server.on_close = common_on_server_close;
-
-  evcom_server_listen(&server, address, 1000);
-  evcom_server_attach(EV_DEFAULT_ &server);
-
-  evcom_stream clients[NCONN];
-  int i;
-  for (i = 0; i < NCONN; i++) {
-    evcom_stream *client = &clients[i];
-    evcom_stream_init(client);
-    client->on_read    = connint_on_client_read;
-    client->on_connect = connint_on_client_connect;
-    client->on_close   = connint_on_client_close;
-    client->on_timeout = common_on_client_timeout;
-    evcom_stream_reset_timeout(client, CONNINT_TIMEOUT);
-#if EVCOM_HAVE_GNUTLS
-    if (use_tls) anon_tls_client(client);
-#endif
-    r = evcom_stream_connect(client, address);
-    assert(r == 0 && "problem connecting");
-    evcom_stream_attach(EV_DEFAULT_ client);
-  }
-
-  ev_loop(EV_DEFAULT_ 0);
-
-  assert(nconnections == NCONN);
-  assert(got_server_close);
-
-  return 0;
-}
-
-
-static evcom_reader reader;
-static evcom_writer writer;
-static int reader_got_close = 0;
-static int reader_got_eof = 0;
-static int reader_got_hello = 0;
-static int reader_cnt = 0;
-static int writer_got_close = 0;
-#define PIPE_MSG "hello world"
-#define PIPE_CNT 5000
-
-static void
-reader_read (evcom_reader *r, const void *str, size_t len)
-{
-  assert(r == &reader);
-
-  if (len == 0) {
-    reader_got_eof = 1;
-    return;
-  }
-
-  assert(len == strlen(PIPE_MSG));
-
-  if (strncmp(str, PIPE_MSG, strlen(PIPE_MSG)) == 0) {
-    reader_got_hello = 1;
-  }
-
-  if (++reader_cnt < PIPE_CNT) {
-    MARK_PROGRESS(".", reader_cnt, PIPE_CNT);
-    evcom_writer_write(&writer, PIPE_MSG, strlen(PIPE_MSG));
-  } else {
-    evcom_writer_close(&writer);
-  }
-}
-
-static void
-reader_close (evcom_reader *r)
-{
-  assert(r == &reader);
-  reader_got_close = 1;
-  evcom_reader_detach(r);
-}
-
-static void
-writer_close (evcom_writer *w)
-{
-  assert(w == &writer);
-  writer_got_close = 1;
-  evcom_writer_detach(w);
-}
-
-int
-pipe_stream (void)
-{
-  reader_cnt = 0;
-  reader_got_close = 0;
-  reader_got_hello = 0;
-  reader_got_eof   = 0;
-  writer_got_close = 0;
-
-  int pipefd[2];
-  int r = pipe(pipefd);
-  if (r < 0) {
-    perror("pipe()");
-    return -1;
-  }
-
-  evcom_reader_init(&reader);
-  reader.on_read = reader_read;
-  reader.on_close = reader_close;
-  evcom_reader_set(&reader, pipefd[0]);
-  evcom_reader_attach(EV_DEFAULT_ &reader);
-
-  evcom_writer_init(&writer);
-  writer.on_close = writer_close;
-  evcom_writer_set(&writer, pipefd[1]);
-  evcom_writer_attach(EV_DEFAULT_ &writer);
-
-  evcom_writer_write(&writer, PIPE_MSG, strlen(PIPE_MSG));
-
-  ev_loop(EV_DEFAULT_ 0);
-
-  assert(reader_got_close);
-  assert(reader_got_hello);
-  assert(reader_got_eof);
-  assert(writer_got_close);
-  assert(reader_cnt == PIPE_CNT);
-
-  return 0;
-}
-
-#define PAIR_PINGPONG_TIMEOUT 5000.0
-#define PAIR_PINGPONG_EXCHANGES 50
-static int a_got_close;
-static int a_got_connect;
-static int b_got_close;
-static int b_got_connect;
-static int pair_pingpong_cnt;
-static evcom_stream a, b;
-
-void a_connect (evcom_stream *stream)
-{
-  assert(stream == &a);
-  a_got_connect = 1;
-}
-
-void a_close (evcom_stream *stream)
-{
-  evcom_stream_detach(stream);
-  assert(stream == &a);
-  a_got_close = 1;
-
-  assert(stream->errorno == 0);
-#if EVCOM_HAVE_GNUTLS
-  if (stream->gnutls_errorno) {
-    fprintf(stderr, "\nGNUTLS ERROR: %s\n", gnutls_strerror(stream->gnutls_errorno));
-  }
-  assert(stream->gnutls_errorno == 0);
-  if (use_tls) gnutls_deinit(stream->session);
-#endif
-}
-
-void a_read (evcom_stream *stream, const void *buf, size_t len)
-{
-  assert(stream == &a);
-  if (len == 0) return;
-
-  assert(len == strlen(PONG));
-  assert(strncmp(buf, PONG, strlen(PONG)) == 0);
-
-  if (++pair_pingpong_cnt < PAIR_PINGPONG_EXCHANGES) {
-    evcom_stream_write(&a, PING, strlen(PING));
-  } else if (pair_pingpong_cnt == PAIR_PINGPONG_EXCHANGES) {
-    evcom_stream_close(stream);
-  }
-
-  MARK_PROGRESS(".", pair_pingpong_cnt, PAIR_PINGPONG_EXCHANGES);
-}
-
-void b_connect (evcom_stream *stream)
-{
-  assert(stream == &b);
-  b_got_connect = 1;
-}
-
-void b_close (evcom_stream *stream)
-{
-  evcom_stream_detach(stream);
-  assert(stream == &b);
-  b_got_close = 1;
-
-  assert(stream->errorno == 0);
-#if EVCOM_HAVE_GNUTLS
-  if (stream->gnutls_errorno) {
-    fprintf(stderr, "\nGNUTLS ERROR: %s\n", gnutls_strerror(stream->gnutls_errorno));
-  }
-  assert(stream->gnutls_errorno == 0);
-  if (use_tls) gnutls_deinit(stream->session);
-#endif
-}
-
-void b_read (evcom_stream *stream, const void *buf, size_t len)
-{
-  assert(stream == &b);
-  if (len == 0) {
-    evcom_stream_close(stream);
-    return;
-  }
-
-  assert(len == strlen(PING));
-  assert(strncmp(buf, PING, strlen(PING)) == 0);
-
-  evcom_stream_write(&b, PONG, strlen(PONG));
-}
-
-int
-pair_pingpong (int use_pipe)
-{
-  a_got_close = 0;
-  a_got_connect = 0;
-  b_got_close = 0;
-  b_got_connect = 0;
-  pair_pingpong_cnt = 0;
-
-  evcom_stream_init(&a);
-  a.on_close = a_close;
-  a.on_connect = a_connect;
-  a.on_read = a_read;
-  evcom_stream_reset_timeout(&a, PAIR_PINGPONG_TIMEOUT);
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_client(&a);
-#endif
-
-  evcom_stream_init(&b);
-  b.on_close = b_close;
-  b.on_connect = b_connect;
-  b.on_read = b_read;
-  evcom_stream_reset_timeout(&b, PAIR_PINGPONG_TIMEOUT);
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_server(&b);
-#endif
-
-  if (use_pipe) {
-    int pipeA[2], pipeB[2];
-    assert(0 == pipe(pipeA));
-    assert(0 == pipe(pipeB));
-
-    evcom_stream_assign_fds(&a, pipeA[0], pipeB[1]);
-    evcom_stream_assign_fds(&b, pipeB[0], pipeA[1]);
-
-  } else {
-    int r = evcom_stream_pair(&a, &b);
-    assert(r == 0);
-  }
-
-  evcom_stream_attach(EV_DEFAULT_ &a);
-  evcom_stream_attach(EV_DEFAULT_ &b);
-
-  evcom_stream_write(&a, PING, strlen(PING));
-
-  ev_loop(EV_DEFAULT_ 0);
-
-  assert(a_got_close);
-  assert(a_got_connect);
-  assert(b_got_close);
-  assert(b_got_connect);
-  assert(pair_pingpong_cnt == PAIR_PINGPONG_EXCHANGES);
-
-  return 0;
-}
-
-
-static void
-free_stream (evcom_stream *stream)
-{
-  assert(stream->errorno == 0);
-  free(stream);
-}
-
-#define ZERO_TIMEOUT 50.0
-static size_t zero_to_write = 0;
-static size_t zero_written = 0;
-static size_t zero_read = 0;
-static size_t zero_client_closed = 0;
-
-static void
-error_out (evcom_stream *stream)
-{
-  assert(stream);
-  fprintf(stderr, "peer connection timeout\n");
-  assert(0);
-}
-
-static void
-echo (evcom_stream *stream, const void *base, size_t len)
-{
-  if(len == 0) {
-    fprintf(stderr, "close");
-    evcom_stream_close(stream);
-  } else {
-    evcom_stream_write(stream, base, len);
-  }
-}
-
-static evcom_stream*
-make_echo_connection (evcom_server *server, struct sockaddr *addr)
-{
-  assert(server);
-  assert(addr);
-
-  evcom_stream *stream = malloc(sizeof(evcom_stream));
-  evcom_stream_init(stream);
-  stream->on_read = echo;
-  stream->on_close = free_stream;
-  stream->on_timeout = error_out;
-  evcom_stream_reset_timeout(stream, ZERO_TIMEOUT);
-
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_server(stream);
-#endif
-
-  return stream;
-}
-
-
-static void
-zero_start (evcom_stream *stream)
-{
-  evcom_stream_write(stream, "0", 1);
-  zero_written++;
-}
-
-static void
-zero_close (evcom_stream *stream)
-{
-  assert(stream);
-  zero_client_closed = 1;
-}
-
-static void
-zero_recv (evcom_stream *stream, const void *buf, size_t len)
-{
-  MARK_PROGRESS("-", zero_read, zero_to_write);
-  zero_read += len;
-
-  size_t i;
-
-  for (i = 0; i < len; i++) {
-    assert(((char*)buf)[i] == '0');
-  }
-
-  for (i = 0; i < MIN(zero_to_write - zero_written, 90000); i++) {
-    evcom_stream_write(stream, "0", 1);
-    zero_written++;
-
-    MARK_PROGRESS(".", zero_written, zero_to_write);
-
-    if (zero_written == zero_to_write) {
-
-      fprintf(stderr, "CLOSE");
-      evcom_stream_close(stream);
-    }
-  }
-
-  if (len == 0) {
-    fprintf(stderr, "finish");
-    evcom_server_close(&server);
-  }
-}
-
-int
-zero_stream (struct sockaddr *address, size_t to_write)
-{
-  int r;
-
-  assert(to_write >= 1024); // should be kind of big at least.
-  zero_to_write = to_write;
-  got_server_close = 0;
-  zero_written = 0;
-  zero_read = 0;
-  zero_client_closed = 0;
-
-  evcom_server_init(&server);
-  server.on_connection = make_echo_connection;
-  server.on_close      = common_on_server_close;
-
-  evcom_server_listen(&server, address, 1000);
-  evcom_server_attach(EV_DEFAULT_ &server);
-
-  evcom_stream client;
-  evcom_stream_init(&client);
-  client.on_read    = zero_recv;
-  client.on_connect = zero_start;
-  client.on_close   = zero_close;
-  client.on_timeout = error_out;
-  evcom_stream_reset_timeout(&client, ZERO_TIMEOUT);
-#if EVCOM_HAVE_GNUTLS
-  if (use_tls) anon_tls_client(&client);
-#endif
-  r = evcom_stream_connect(&client, address);
-  assert(r == 0 && "problem connecting");
-  evcom_stream_attach(EV_DEFAULT_ &client);
-
-  ev_loop(EV_DEFAULT_ 0);
-
-  assert(got_server_close);
-  assert(zero_written == zero_to_write);
-  assert(zero_read == zero_to_write);
-  assert(zero_client_closed) ;
-
-  return 0;
-}
-
-
-struct sockaddr *
-create_unix_address (void)
-{
-  struct stat tstat;
-  if (lstat(SOCKFILE, &tstat) == 0) {
-    assert(S_ISSOCK(tstat.st_mode));
-    unlink(SOCKFILE);
-  }
-
-  struct sockaddr_un *address = calloc(1, sizeof(struct sockaddr_un));
-  address->sun_family = AF_UNIX;
-  strcpy(address->sun_path, SOCKFILE);
-
-  return (struct sockaddr*)address;
-}
-
-void
-free_unix_address (struct sockaddr *address)
-{
-  struct stat tstat;
-  if (lstat(SOCKFILE, &tstat) == 0) {
-    assert(S_ISSOCK(tstat.st_mode));
-    unlink(SOCKFILE);
-  }
-  free(address);
-}
-
-
-int
-main (void)
-{
-  fprintf(stderr, "sizeof(evcom_server): %d\n", (int)sizeof(evcom_server));
-  fprintf(stderr, "sizeof(evcom_stream): %d\n", (int)sizeof(evcom_stream));
-  fprintf(stderr, "sizeof(evcom_reader): %d\n", (int)sizeof(evcom_reader));
-  fprintf(stderr, "sizeof(evcom_writer): %d\n", (int)sizeof(evcom_writer));
-
-  evcom_ignore_sigpipe();
-
-#if EVCOM_HAVE_GNUTLS
-  gnutls_global_init();
-
-  gnutls_dh_params_init (&dh_params);
-
-  fsync((int)stderr);
-  gnutls_dh_params_generate2 (dh_params, DH_BITS);
-
-  gnutls_anon_allocate_server_credentials (&server_credentials);
-  gnutls_anon_set_server_dh_params (server_credentials, dh_params);
-#endif
-
-
-  struct sockaddr_in tcp_address;
-  memset(&tcp_address, 0, sizeof(struct sockaddr_in));
-  tcp_address.sin_family = AF_INET;
-  tcp_address.sin_port = htons(PORT);
-  tcp_address.sin_addr.s_addr = INADDR_ANY;
-
-  use_tls = 0;
-
-  fprintf(stderr, "pair_pingpong use_pipe=1: ");
-  assert(pair_pingpong(1) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "pair_pingpong use_pipe=0: ");
-  assert(pair_pingpong(0) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "zero_stream tcp: ");
-  assert(zero_stream((struct sockaddr*)&tcp_address, 5*1024*1024) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "pipe_stream: ");
-  assert(pipe_stream() == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "pingpong tcp: ");
-  assert(pingpong((struct sockaddr*)&tcp_address) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "connint tcp: ");
-  assert(connint((struct sockaddr*)&tcp_address) == 0);
-  fprintf(stderr, "\n");
-
-#if EVCOM_HAVE_GNUTLS
-  use_tls = 1;
-
-  fprintf(stderr, "zero_stream ssl: ");
-  assert(zero_stream((struct sockaddr*)&tcp_address, 50*1024) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "pair_pingpong ssl use_pipe=1: ");
-  assert(pair_pingpong(1) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "pair_pingpong ssl use_pipe=0: ");
-  assert(pair_pingpong(0) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "pingpong ssl: ");
-  assert(pingpong((struct sockaddr*)&tcp_address) == 0);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "connint ssl: ");
-  assert(connint((struct sockaddr*)&tcp_address) == 0);
-  fprintf(stderr, "\n");
-
-#endif
-
-  struct sockaddr *unix_address;
-
-  use_tls = 0;
-
-  fprintf(stderr, "pingpong unix: ");
-  unix_address = create_unix_address();
-  assert(pingpong(unix_address) == 0);
-  free_unix_address(unix_address);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "connint unix: ");
-  unix_address = create_unix_address();
-  assert(connint(unix_address) == 0);
-  free_unix_address(unix_address);
-  fprintf(stderr, "\n");
-
-#if EVCOM_HAVE_GNUTLS
-  use_tls = 1;
-
-  fprintf(stderr, "pingpong unix ssl: ");
-  unix_address = create_unix_address();
-  assert(pingpong(unix_address) == 0);
-  free_unix_address(unix_address);
-  fprintf(stderr, "\n");
-
-  fprintf(stderr, "connint unix ssl: ");
-  unix_address = create_unix_address();
-  assert(connint(unix_address) == 0);
-  free_unix_address(unix_address);
-  fprintf(stderr, "\n");
-#endif
-
-  return 0;
-}
--- a/deps/evcom/test/timeout.rb
+++ b/deps/evcom/test/timeout.rb
@@ -1,98 +0,0 @@
-#!/usr/bin/env ruby
-require 'socket'
-
-def test(description)
-  pid = fork do
-    exec(File.dirname(__FILE__) + "/echo")
-  end
-
-  puts "#{description}: "
-  begin
-    sleep 0.5 # give time for the server to start
-    yield(pid)
-  rescue
-    puts "\033[1;31mFAIL\033[m"
-    raise $!
-  ensure
-    `kill -9 #{pid}`
-  end
-  puts "\033[1;32mPASS\033[m"
-end
-
-test("make sure echo server works") do 
-  socket = TCPSocket.open("localhost", 5000)
-  w = socket.write("hello");
-  raise "error" unless w == 5
-
-  got = socket.recv(5);
-  raise "error" unless got == "hello" 
-
-  socket.close
-end
-
-test("doing nothing should not timeout the server") do |pid|
-  10.times do
-    print "."
-    STDOUT.flush
-    if Process.waitpid(pid, Process::WNOHANG)
-      raise "server died when it shouldn't have"
-    end
-    sleep 1
-  end
-  puts ""
-end
-
-test("connecting and doing nothing to should timeout in 5 seconds") do |pid|
-  socket = TCPSocket.open("localhost", 5000)
-  i = 0
-  10.times do
-    print "."
-    STDOUT.flush
-    break if Process.waitpid(pid, Process::WNOHANG)
-    sleep 1
-    i+=1
-  end
-  puts ""
-  raise "died too soon (after #{i} seconds)" if i < 5
-  raise "died too late (after #{i} seconds)" if i > 6
-end
-
-
-test("connecting and writing once to should timeout in 5 seconds") do |pid|
-  socket = TCPSocket.open("localhost", 5000)
-  w = socket.write("hello");
-  raise "error" unless w == 5
-
-  i = 0
-  10.times do
-    print "."
-    STDOUT.flush
-    break if Process.waitpid(pid, Process::WNOHANG)
-    sleep 1
-    i+=1
-  end
-  puts ""
-  raise "died too soon (after #{i} seconds)" if i < 5
-  raise "died too late (after #{i} seconds)" if i > 6
-end
-
-test("connecting waiting 3, writing once to should timeout in 8 seconds") do |pid|
-  socket = TCPSocket.open("localhost", 5000)
-
-  sleep 3
-
-  w = socket.write("hello");
-  raise "error" unless w == 5
-
-  i = 0
-  10.times do
-    print "."
-    STDOUT.flush
-    break if Process.waitpid(pid, Process::WNOHANG)
-    sleep 1
-    i+=1
-  end
-  puts ""
-  raise "died too soon (after #{i} seconds)" if i < 5
-  raise "died too late (after #{i} seconds)" if i > 6
-end
--- a/deps/http_parser/.gitignore
+++ b/deps/http_parser/.gitignore
@@ -0,0 +1,8 @@
+core
+tags
+*.o
+test
+test_g
+test_fast
+*.mk
+*.Makefile
--- a/deps/http_parser/.mailmap
+++ b/deps/http_parser/.mailmap
@@ -0,0 +1,4 @@
+# update AUTHORS with:
+#   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>
--- a/deps/http_parser/AUTHORS
+++ b/deps/http_parser/AUTHORS
@@ -0,0 +1,32 @@
+# Authors ordered by first contribution.
+Ryan Dahl <ry@tinyclouds.org>
+Jeremy Hinegardner <jeremy@hinegardner.org>
+Sergey Shepelev <temotor@gmail.com>
+Joe Damato <ice799@gmail.com>
+tomika <tomika_nospam@freemail.hu>
+Phoenix Sol <phoenix@burninglabs.com>
+Cliff Frey <cliff@meraki.com>
+Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
+Santiago Gala <sgala@apache.org>
+Tim Becker <tim.becker@syngenio.de>
+Jeff Terrace <jterrace@gmail.com>
+Ben Noordhuis <info@bnoordhuis.nl>
+Nathan Rajlich <nathan@tootallnate.net>
+Mark Nottingham <mnot@mnot.net>
+Aman Gupta <aman@tmm1.net>
+Tim Becker <tim.becker@kuriositaet.de>
+Sean Cunningham <sean.cunningham@mandiant.com>
+Peter Griess <pg@std.in>
+Salman Haq <salman.haq@asti-usa.com>
+Cliff Frey <clifffrey@gmail.com>
+Jon Kolb <jon@b0g.us>
+Fouad Mardini <f.mardini@gmail.com>
+Paul Querna <pquerna@apache.org>
+Felix Geisendörfer <felix@debuggable.com>
+koichik <koichik@improvement.jp>
+Andre Caron <andre.l.caron@gmail.com>
+Ivo Raisr <ivosh@ivosh.net>
+James McLaughlin <jamie@lacewing-project.org>
+David Gwynne <loki@animata.net>
+LE ROUX Thomas <thomas@procheo.fr>
+Randy Rizun <rrizun@ortivawireless.com>
--- a/deps/http_parser/CONTRIBUTIONS
+++ b/deps/http_parser/CONTRIBUTIONS
@@ -0,0 +1,4 @@
+Contributors must agree to the Contributor License Agreement before patches
+can be accepted.
+
+http://spreadsheets2.google.com/viewform?hl=en&formkey=dDJXOGUwbzlYaWM4cHN1MERwQS1CSnc6MQ
--- a/deps/http_parser/LICENSE
+++ b/deps/http_parser/LICENSE
@@ -1,79 +0,0 @@
-Copyright 2009, Ryan Lienhart Dahl. All rights reserved.
-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. 
-
-
-
-
-http_parser is based on Zed Shaw's Mongrel. Mongrel's license is as follows.
-
-- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT --
-Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
-<zedshaw at zedshaw dot com> and contributors. You can redistribute it 
-and/or modify it under either the terms of the GPL2 or the conditions below:
-
-1. You may make and give away verbatim copies of the source form of the
-   software without restriction, provided that you duplicate all of the
-   original copyright notices and associated disclaimers.
-
-2. You may modify your copy of the software in any way, provided that
-   you do at least ONE of the following:
-
-     a) place your modifications in the Public Domain or otherwise make them
-     Freely Available, such as by posting said modifications to Usenet or an
-     equivalent medium, or by allowing the author to include your
-     modifications in the software.
-
-     b) use the modified software only within your corporation or
-        organization.
-
-     c) rename any non-standard executables so the names do not conflict with
-     standard executables, which must also be provided.
-
-     d) make other distribution arrangements with the author.
-
-3. You may distribute the software in object code or executable
-   form, provided that you do at least ONE of the following:
-
-     a) distribute the executables and library files of the software,
-     together with instructions (in the manual page or equivalent) on where
-     to get the original distribution.
-
-     b) accompany the distribution with the machine-readable source of the
-     software.
-
-     c) give non-standard executables non-standard names, with
-        instructions on where to get the original software distribution.
-
-     d) make other distribution arrangements with the author.
-
-4. You may modify and include the part of the software into any other
-   software (possibly commercial).  But some files in the distribution
-   are not written by the author, so that they are not under this terms.
-
-5. The scripts and library files supplied as input to or produced as 
-   output from the software do not automatically fall under the
-   copyright of the software, but belong to whomever generated them, 
-   and may be sold commercially, and may be aggregated with this
-   software.
-
-6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE.
-- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT ---- CUT --
--- a/deps/http_parser/LICENSE-MIT
+++ b/deps/http_parser/LICENSE-MIT
@@ -0,0 +1,23 @@
+http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
+Igor Sysoev.
+
+Additional changes are licensed under the same terms as NGINX and
+copyright Joyent, Inc. and other Node contributors. All rights reserved.
+
+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. 
--- a/deps/http_parser/Makefile
+++ b/deps/http_parser/Makefile
@@ -1,27 +1,58 @@
-#OPT=-O0 -g -Wall -Wextra -Werror
-OPT=-O2
+CC?=gcc
+AR?=ar

-test: http_parser.o test.c 
-	gcc $(OPT) http_parser.o test.c -o $@ 
+CPPFLAGS += -I.
+CPPFLAGS_DEBUG = $(CPPFLAGS) -DHTTP_PARSER_STRICT=1 -DHTTP_PARSER_DEBUG=1
+CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA)
+CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0 -DHTTP_PARSER_DEBUG=0
+CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
+
+CFLAGS += -Wall -Wextra -Werror
+CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
+CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
+CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+
+test: test_g test_fast
+	./test_g
+	./test_fast
+
+test_g: http_parser_g.o test_g.o
+	$(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o test_g.o -o $@
+
+test_g.o: test.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c test.c -o $@
+
+http_parser_g.o: http_parser.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c http_parser.c -o $@
+
+test_fast: http_parser.o test.o http_parser.h
+	$(CC) $(CFLAGS_FAST) $(LDFLAGS) http_parser.o test.o -o $@
+
+test.o: test.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c test.c -o $@

 http_parser.o: http_parser.c http_parser.h Makefile
-	gcc $(OPT) -c http_parser.c
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c

-http_parser.c: http_parser.rl Makefile
-	ragel -s -G2 http_parser.rl -o $@
+test-run-timed: test_fast
+	while(true) do time ./test_fast > /dev/null; done

-tags: http_parser.rl http_parser.h test.c
+test-valgrind: test_g
+	valgrind ./test_g
+
+libhttp_parser.o: http_parser.c http_parser.h Makefile
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
+
+library: libhttp_parser.o
+	$(CC) -shared -o libhttp_parser.so libhttp_parser.o
+
+package: http_parser.o
+	$(AR) rcs libhttp_parser.a http_parser.o
+
+tags: http_parser.c http_parser.h test.c
 	ctags $^

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

-package: http_parser.c
-	@rm -rf /tmp/http_parser && mkdir /tmp/http_parser && \
-	cp LICENSE README.md Makefile http_parser.c http_parser.rl \
-		http_parser.h test.c /tmp/http_parser && \
-	cd /tmp && \
-	tar -cf http_parser.tar http_parser/
-	@echo /tmp/http_parser.tar
-
-.PHONY: clean package
+.PHONY: clean package test-run test-run-timed test-valgrind
--- a/deps/http_parser/README.md
+++ b/deps/http_parser/README.md
@@ -1,88 +1,137 @@
 HTTP Parser
 ===========

-This is a parser for HTTP messages written in C. It parses both requests
-and responses. The parser is designed to be used in performance HTTP
-applications. It does not make any allocations, it does not buffer data, and
-it can be interrupted at anytime. It only requires about 128 bytes of data
-per message stream (in a web server that is per connection). 
+This is a parser for HTTP messages written in C. It parses both requests and
+responses. The parser is designed to be used in performance HTTP
+applications. It does not make any syscalls nor allocations, it does not
+buffer data, it can be interrupted at anytime. Depending on your
+architecture, it only requires about 40 bytes of data per message
+stream (in a web server that is per connection).

 Features:

-  * No dependencies 
-  * Parses both requests and responses.
-  * Handles keep-alive streams.
+  * No dependencies
+  * Handles persistent streams (keep-alive).
  * Decodes chunked encoding.
-  * Extracts the following data from a message
-    * header fields and values
-    * content-length
-    * request method
-    * response status code
-    * transfer-encoding
-    * http version
-    * request path, query string, fragment
-    * message body
+  * Upgrade support
  * Defends against buffer overflow attacks.

+The parser extracts the following information from HTTP messages:
+
+  * Header fields and values
+  * Content-Length
+  * Request method
+  * Response status code
+  * Transfer-Encoding
+  * HTTP version
+  * Request URL
+  * Message body
+
+
 Usage
 -----

 One `http_parser` object is used per TCP connection. Initialize the struct
 using `http_parser_init()` and set the callbacks. That might look something
-like this:
+like this for a request parser:
+
+    http_parser_settings settings;
+    settings.on_path = my_path_callback;
+    settings.on_header_field = my_header_field_callback;
+    /* ... */

    http_parser *parser = malloc(sizeof(http_parser));
    http_parser_init(parser, HTTP_REQUEST);
-    parser->on_path = my_path_callback;
-    parser->on_header_field = my_header_field_callback;
    parser->data = my_socket;

 When data is received on the socket execute the parser and check for errors.

-    size_t len = 80*1024;
+    size_t len = 80*1024, nparsed;
    char buf[len];
    ssize_t recved;

-    recved = read(fd, buf, len);
-    if (recved != 0) // handle error
+    recved = recv(fd, buf, len, 0);

-    http_parser_execute(parser, buf, recved);
-
-    if (http_parser_has_error(parser)) {
-      // handle error. usually just close the connection
+    if (recved < 0) {
+      /* Handle error. */
    }

+    /* Start up / continue the parser.
+     * Note we pass recved==0 to signal that EOF has been recieved.
+     */
+    nparsed = http_parser_execute(parser, &settings, buf, recved);
+
+    if (parser->upgrade) {
+      /* handle new protocol */
+    } else if (nparsed != recved) {
+      /* Handle error. Usually just close the connection. */
+    }
+
+HTTP needs to know where the end of the stream is. For example, sometimes
+servers send responses without Content-Length and expect the client to
+consume input (for the body) until EOF. To tell http_parser about EOF, give
+`0` as the forth parameter to `http_parser_execute()`. Callbacks and errors
+can still be encountered during an EOF, so one must still be prepared
+to receive them.
+
 Scalar valued message information such as `status_code`, `method`, and the
 HTTP version are stored in the parser structure. This data is only
-temporarlly stored in `http_parser` and gets reset on each new message. If
+temporally stored in `http_parser` and gets reset on each new message. If
 this information is needed later, copy it out of the structure during the
 `headers_complete` callback.
-  
+
 The parser decodes the transfer-encoding for both requests and responses
 transparently. That is, a chunked encoding is decoded before being sent to
 the on_body callback.

-It does not decode the content-encoding (gzip). Not all HTTP applications
-need to inspect the body. Decoding gzip is non-neglagable amount of
-processing (and requires making allocations). HTTP proxies using this
-parser, for example, would not want such a feature.
+
+The Special Problem of Upgrade
+------------------------------
+
+HTTP supports upgrading the connection to a different protocol. An
+increasingly common example of this is the Web Socket protocol which sends
+a request like
+
+        GET /demo HTTP/1.1
+        Upgrade: WebSocket
+        Connection: Upgrade
+        Host: example.com
+        Origin: http://example.com
+        WebSocket-Protocol: sample
+
+followed by non-HTTP data.
+
+(See http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75 for more
+information the Web Socket protocol.)
+
+To support this, the parser will treat this as a normal HTTP message without a
+body. Issuing both on_headers_complete and on_message_complete callbacks. However
+http_parser_execute() will stop parsing at the end of the headers and return.
+
+The user is expected to check if `parser->upgrade` has been set to 1 after
+`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
+offset by the return value of `http_parser_execute()`.
+

 Callbacks
 ---------

-During the `http_parser_execute()` call, the callbacks set in `http_parser`
-will be executed. The parser maintains state and never looks behind, so
-buffering the data is not necessary. If you need to save certain data for
-later usage, you can do that from the callbacks.
+During the `http_parser_execute()` call, the callbacks set in
+`http_parser_settings` will be executed. The parser maintains state and
+never looks behind, so buffering the data is not necessary. If you need to
+save certain data for later usage, you can do that from the callbacks.

 There are two types of callbacks:

 * notification `typedef int (*http_cb) (http_parser*);`
    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
 * data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
-    Callbacks: (requests only) on_path, on_query_string, on_uri, on_fragment,
+    Callbacks: (requests only) on_uri,
               (common) on_header_field, on_header_value, on_body;

+Callbacks must return 0 on success. Returning a non-zero value indicates
+error to the parser, making it exit immediately.
+
 In case you parse HTTP message in chunks (i.e. `read()` request line
 from socket, parse, read half headers, parse, etc) your data callbacks
 may be called more than once. Http-parser guarantees that data pointer is only
@@ -93,7 +142,7 @@ Reading headers may be a tricky task if you read/parse headers partially.
 Basically, you need to remember whether last header callback was field or value
 and apply following logic:

-    /* on_header_field and on_header_value shortened to on_h_*
+    (on_header_field and on_header_value shortened to on_h_*)
     ------------------------ ------------ --------------------------------------------
    | State (prev. callback) | Callback   | Description/action                         |
     ------------------------ ------------ --------------------------------------------
@@ -113,19 +162,17 @@ and apply following logic:
    | value                  | on_h_value | Value continues. Reallocate value buffer   |
    |                        |            | and append callback data to it             |
     ------------------------ ------------ --------------------------------------------
-    */
+
+
+Parsing URLs
+------------
+
+A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
+Users of this library may wish to use it to parse URLs constructed from
+consecutive `on_url` callbacks.

 See examples of reading in headers:

 * [partial example](http://gist.github.com/155877) in C
-* [from http-parser tests](http://github.com/ry/http-parser/blob/37a0ff8928fb0d83cec0d0d8909c5a4abcd221af/test.c#L403) in C
-* [from Node library](http://github.com/ry/node/blob/842eaf446d2fdcb33b296c67c911c32a0dabc747/src/http.js#L284) in Javascript
-
-Releases
--------
-
-  * [0.2](http://s3.amazonaws.com/four.livejournal/20090807/http_parser-0.2.tar.gz)
-
-  * [0.1](http://s3.amazonaws.com/four.livejournal/20090427/http_parser-0.1.tar.gz)
-
-The source repo is at [github](http://github.com/ry/http-parser).
+* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
+* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript
--- a/deps/http_parser/http_parser.c
+++ b/deps/http_parser/http_parser.c
--- a/deps/http_parser/http_parser.gyp
+++ b/deps/http_parser/http_parser.gyp
@@ -0,0 +1,79 @@
+# This file is used with the GYP meta build system.
+# http://code.google.com/p/gyp/
+# To build try this:
+#   svn co http://gyp.googlecode.com/svn/trunk gyp
+#   ./gyp/gyp -f make --depth=`pwd` http_parser.gyp 
+#   ./out/Debug/test 
+{
+  'target_defaults': {
+    'default_configuration': 'Debug',
+    'configurations': {
+      # TODO: hoist these out and put them somewhere common, because
+      #       RuntimeLibrary MUST MATCH across the entire project
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 1, # static debug
+          },
+        },
+      },
+      'Release': {
+        'defines': [ 'NDEBUG' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 0, # static release
+          },
+        },
+      }
+    },
+    'msvs_settings': {
+      'VCCLCompilerTool': {
+      },
+      'VCLibrarianTool': {
+      },
+      'VCLinkerTool': {
+        'GenerateDebugInformation': 'true',
+      },
+    },
+    'conditions': [
+      ['OS == "win"', {
+        'defines': [
+          'WIN32'
+        ],
+      }]
+    ],
+  },
+
+  'targets': [
+    {
+      'target_name': 'http_parser',
+      'type': 'static_library',
+      'include_dirs': [ '.' ],
+      'direct_dependent_settings': {
+        'include_dirs': [ '.' ],
+      },
+      'defines': [ 'HTTP_PARSER_STRICT=0' ],
+      'sources': [ './http_parser.c', ],
+      'conditions': [
+        ['OS=="win"', {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # Compile as C++. http_parser.c is actually C99, but C++ is
+              # close enough in this case.
+              'CompileAs': 2,
+            },
+          },
+        }]
+      ],
+    },
+
+    {
+      'target_name': 'test',
+      'type': 'executable',
+      'dependencies': [ 'http_parser' ],
+      'sources': [ 'test.c' ]
+    }
+  ]
+}
+
--- a/deps/http_parser/http_parser.h
+++ b/deps/http_parser/http_parser.h
@@ -1,40 +1,81 @@
-/* Copyright (c) 2008, 2009 Ryan Dahl (ry@tinyclouds.org)
- * Based on Zed Shaw's Mongrel, copyright (c) Zed A. Shaw
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 *
- * All rights reserved.
- * 
- * 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. 
+ * 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.
 */
 #ifndef http_parser_h
 #define http_parser_h
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
+
+#define HTTP_PARSER_VERSION_MAJOR 1
+#define HTTP_PARSER_VERSION_MINOR 0
+
+#include <sys/types.h>
+#if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+
+typedef unsigned int size_t;
+typedef int ssize_t;
+#else
+#include <stdint.h>
+#endif
+
+/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
+ * faster
+ */
+#ifndef HTTP_PARSER_STRICT
+# define HTTP_PARSER_STRICT 1
+#endif
+
+/* Compile with -DHTTP_PARSER_DEBUG=1 to add extra debugging information to
+ * the error reporting facility.
+ */
+#ifndef HTTP_PARSER_DEBUG
+# define HTTP_PARSER_DEBUG 0
+#endif
+
+
+/* Maximium header size allowed */
+#define HTTP_MAX_HEADER_SIZE (80*1024)

-#include <sys/types.h> 

 typedef struct http_parser http_parser;
+typedef struct http_parser_settings http_parser_settings;

-/* Callbacks should return non-zero to indicate an error. The parse will
- * then halt execution. 
- * 
+
+/* Callbacks should return non-zero to indicate an error. The parser will
+ * then halt execution.
+ *
+ * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
+ * returning '1' from on_headers_complete will tell the parser that it
+ * should not expect a body. This is used when receiving a response to a
+ * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
+ * chunked' headers that indicate the presence of a body.
+ *
 * http_data_cb does not return data chunks. It will be call arbitrarally
 * many times for each string. E.G. you might get 10 callbacks for "on_path"
 * each providing just a few characters more data.
@@ -42,90 +83,164 @@ typedef struct http_parser http_parser;
 typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
 typedef int (*http_cb) (http_parser*);

+
 /* Request Methods */
-#define HTTP_COPY       0x0001
-#define HTTP_DELETE     0x0002
-#define HTTP_GET        0x0004
-#define HTTP_HEAD       0x0008
-#define HTTP_LOCK       0x0010
-#define HTTP_MKCOL      0x0020
-#define HTTP_MOVE       0x0040
-#define HTTP_OPTIONS    0x0080
-#define HTTP_POST       0x0100
-#define HTTP_PROPFIND   0x0200
-#define HTTP_PROPPATCH  0x0400
-#define HTTP_PUT        0x0800
-#define HTTP_TRACE      0x1000
-#define HTTP_UNLOCK     0x2000
+#define HTTP_METHOD_MAP(XX)         \
+  XX(0,  DELETE,      DELETE)       \
+  XX(1,  GET,         GET)          \
+  XX(2,  HEAD,        HEAD)         \
+  XX(3,  POST,        POST)         \
+  XX(4,  PUT,         PUT)          \
+  /* pathological */                \
+  XX(5,  CONNECT,     CONNECT)      \
+  XX(6,  OPTIONS,     OPTIONS)      \
+  XX(7,  TRACE,       TRACE)        \
+  /* webdav */                      \
+  XX(8,  COPY,        COPY)         \
+  XX(9,  LOCK,        LOCK)         \
+  XX(10, MKCOL,       MKCOL)        \
+  XX(11, MOVE,        MOVE)         \
+  XX(12, PROPFIND,    PROPFIND)     \
+  XX(13, PROPPATCH,   PROPPATCH)    \
+  XX(14, SEARCH,      SEARCH)       \
+  XX(15, UNLOCK,      UNLOCK)       \
+  /* subversion */                  \
+  XX(16, REPORT,      REPORT)       \
+  XX(17, MKACTIVITY,  MKACTIVITY)   \
+  XX(18, CHECKOUT,    CHECKOUT)     \
+  XX(19, MERGE,       MERGE)        \
+  /* upnp */                        \
+  XX(20, MSEARCH,     M-SEARCH)     \
+  XX(21, NOTIFY,      NOTIFY)       \
+  XX(22, SUBSCRIBE,   SUBSCRIBE)    \
+  XX(23, UNSUBSCRIBE, UNSUBSCRIBE)  \
+  /* RFC-5789 */                    \
+  XX(24, PATCH,       PATCH)        \
+  XX(25, PURGE,       PURGE)        \

-/* Transfer Encodings */
-#define HTTP_IDENTITY   0x01
-#define HTTP_CHUNKED    0x02
+enum http_method
+  {
+#define XX(num, name, string) HTTP_##name = num,
+  HTTP_METHOD_MAP(XX)
+#undef XX
+  };
+
+
+enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
+
+
+/* Flag values for http_parser.flags field */
+enum flags
+  { F_CHUNKED               = 1 << 0
+  , F_CONNECTION_KEEP_ALIVE = 1 << 1
+  , F_CONNECTION_CLOSE      = 1 << 2
+  , F_TRAILING              = 1 << 3
+  , F_UPGRADE               = 1 << 4
+  , F_SKIPBODY              = 1 << 5
+  };
+
+
+/* Map for errno-related constants
+ * 
+ * The provided argument should be a macro that takes 2 arguments.
+ */
+#define HTTP_ERRNO_MAP(XX)                                           \
+  /* No error */                                                     \
+  XX(OK, "success")                                                  \
+                                                                     \
+  /* Callback-related errors */                                      \
+  XX(CB_message_begin, "the on_message_begin callback failed")       \
+  XX(CB_url, "the on_url callback failed")                           \
+  XX(CB_header_field, "the on_header_field callback failed")         \
+  XX(CB_header_value, "the on_header_value callback failed")         \
+  XX(CB_headers_complete, "the on_headers_complete callback failed") \
+  XX(CB_body, "the on_body callback failed")                         \
+  XX(CB_message_complete, "the on_message_complete callback failed") \
+                                                                     \
+  /* Parsing-related errors */                                       \
+  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
+  XX(HEADER_OVERFLOW,                                                \
+     "too many header bytes seen; overflow detected")                \
+  XX(CLOSED_CONNECTION,                                              \
+     "data received after completed connection: close message")      \
+  XX(INVALID_VERSION, "invalid HTTP version")                        \
+  XX(INVALID_STATUS, "invalid HTTP status code")                     \
+  XX(INVALID_METHOD, "invalid HTTP method")                          \
+  XX(INVALID_URL, "invalid URL")                                     \
+  XX(INVALID_HOST, "invalid host")                                   \
+  XX(INVALID_PORT, "invalid port")                                   \
+  XX(INVALID_PATH, "invalid path")                                   \
+  XX(INVALID_QUERY_STRING, "invalid query string")                   \
+  XX(INVALID_FRAGMENT, "invalid fragment")                           \
+  XX(LF_EXPECTED, "LF character expected")                           \
+  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
+  XX(INVALID_CONTENT_LENGTH,                                         \
+     "invalid character in content-length header")                   \
+  XX(INVALID_CHUNK_SIZE,                                             \
+     "invalid character in chunk size header")                       \
+  XX(INVALID_CONSTANT, "invalid constant string")                    \
+  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
+  XX(STRICT, "strict mode assertion failed")                         \
+  XX(PAUSED, "parser is paused")                                     \
+  XX(UNKNOWN, "an unknown error occurred")
+
+
+/* Define HPE_* values for each errno value above */
+#define HTTP_ERRNO_GEN(n, s) HPE_##n,
+enum http_errno {
+  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
+};
+#undef HTTP_ERRNO_GEN
+
+
+/* Get an http_errno value from an http_parser */
+#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
+
+/* Get the line number that generated the current error */
+#if HTTP_PARSER_DEBUG
+#define HTTP_PARSER_ERRNO_LINE(p)       ((p)->error_lineno)
+#else
+#define HTTP_PARSER_ERRNO_LINE(p)       0
+#endif

-enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE };

 struct http_parser {
  /** PRIVATE **/
-  int cs;
-  enum http_parser_type type;
+  unsigned char type : 2;     /* enum http_parser_type */
+  unsigned char flags : 6;    /* F_* values from 'flags' enum; semi-public */
+  unsigned char state;        /* enum state from http_parser.c */
+  unsigned char header_state; /* enum header_state from http_parser.c */
+  unsigned char index;        /* index into current matcher */

-  size_t chunk_size;
-
-  /**
-    XXX
-    do this so no other code has to change, but make the field only 1 byte wide
-    instead of 2 (on x86/x86_64).
-
-    doing this not only shrinks the sizeof this struct by a byte but it ALSO
-    makes wrapping this in FFI way easier.
-   */
-  union {
-    struct {
-      unsigned eating:1;
-      unsigned error:1;
-    };
-    struct {
-      unsigned char _flags;
-    };
-  };
-
-  size_t body_read;
-
-  const char *header_field_mark; 
-  size_t      header_field_size; 
-  const char *header_value_mark; 
-  size_t      header_value_size; 
-  const char *query_string_mark; 
-  size_t      query_string_size; 
-  const char *path_mark; 
-  size_t      path_size; 
-  const char *uri_mark; 
-  size_t      uri_size; 
-  const char *fragment_mark; 
-  size_t      fragment_size; 
+  uint32_t nread;          /* # bytes read in various scenarios */
+  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */

  /** READ-ONLY **/
+  unsigned short http_major;
+  unsigned short http_minor;
  unsigned short status_code; /* responses only */
-  unsigned short method;      /* requests only */
-  short transfer_encoding;
-  unsigned short version_major;
-  unsigned short version_minor;
-  short keep_alive;
-  size_t content_length;
+  unsigned char method;       /* requests only */
+  unsigned char http_errno : 7;
+
+  /* 1 = Upgrade header was present and the parser has exited because of that.
+   * 0 = No upgrade header present.
+   * Should be checked when http_parser_execute() returns in addition to
+   * error checking.
+   */
+  unsigned char upgrade : 1;
+
+#if HTTP_PARSER_DEBUG
+  uint32_t error_lineno;
+#endif

  /** PUBLIC **/
  void *data; /* A pointer to get hook to the "connection" or "socket" object */
+};

-  /* an ordered list of callbacks */

+struct http_parser_settings {
  http_cb      on_message_begin;
-
-  /* requests only */
-  http_data_cb on_path;
-  http_data_cb on_query_string;
-  http_data_cb on_uri;
-  http_data_cb on_fragment;
-
+  http_data_cb on_url;
  http_data_cb on_header_field;
  http_data_cb on_header_value;
  http_cb      on_headers_complete;
@@ -133,18 +248,71 @@ struct http_parser {
  http_cb      on_message_complete;
 };

-/* Initializes an http_parser structure.  The second argument specifies if
- * it will be parsing requests or responses. 
+
+enum http_parser_url_fields
+  { UF_SCHEMA           = 0
+  , UF_HOST             = 1
+  , UF_PORT             = 2
+  , UF_PATH             = 3
+  , UF_QUERY            = 4
+  , UF_FRAGMENT         = 5
+  , UF_MAX              = 6
+  };
+
+
+/* Result structure for http_parser_parse_url().
+ *
+ * Callers should index into field_data[] with UF_* values iff field_set
+ * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
+ * because we probably have padding left over), we convert any port to
+ * a uint16_t.
 */
-void http_parser_init (http_parser *parser, enum http_parser_type);
+struct http_parser_url {
+  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
+  uint16_t port;                /* Converted UF_PORT string */

-size_t http_parser_execute (http_parser *parser, const char *data, size_t len);
+  struct {
+    uint16_t off;               /* Offset into buffer in which field starts */
+    uint16_t len;               /* Length of run in buffer */
+  } field_data[UF_MAX];
+};

-int http_parser_has_error (http_parser *parser);

-int http_parser_should_keep_alive (http_parser *parser);
+void http_parser_init(http_parser *parser, enum http_parser_type type);
+
+
+size_t http_parser_execute(http_parser *parser,
+                           const http_parser_settings *settings,
+                           const char *data,
+                           size_t len);
+
+
+/* If http_should_keep_alive() in the on_headers_complete or
+ * on_message_complete callback returns true, then this will be should be
+ * the last message on the connection.
+ * If you are the server, respond with the "Connection: close" header.
+ * If you are the client, close the connection.
+ */
+int http_should_keep_alive(http_parser *parser);
+
+/* Returns a string version of the HTTP method. */
+const char *http_method_str(enum http_method m);
+
+/* Return a string name of the given error */
+const char *http_errno_name(enum http_errno err);
+
+/* Return a string description of the given error */
+const char *http_errno_description(enum http_errno err);
+
+/* Parse a URL; return nonzero on failure */
+int http_parser_parse_url(const char *buf, size_t buflen,
+                          int is_connect,
+                          struct http_parser_url *u);
+
+/* Pause or un-pause the parser; a nonzero value pauses */
+void http_parser_pause(http_parser *parser, int paused);

 #ifdef __cplusplus
 }
-#endif 
+#endif
 #endif
--- a/deps/http_parser/http_parser.rl
+++ b/deps/http_parser/http_parser.rl
@@ -1,502 +0,0 @@
-/* Copyright (c) 2008, 2009 Ryan Dahl (ry@tinyclouds.org)
- * Based on Zed Shaw's Mongrel, copyright (c) Zed A. Shaw
- *
- * All rights reserved.
- * 
- * 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. 
- */
-#include "http_parser.h"
-#include <limits.h>
-#include <assert.h>
-
-static int unhex[] = {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1
-                     ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-                     };
-#define TRUE 1
-#define FALSE 0
-#define MIN(a,b) (a < b ? a : b)
-#define NULL (void*)(0)
-
-#define MAX_FIELD_SIZE 80*1024
-
-#define REMAINING (unsigned long)(pe - p)
-#define CALLBACK(FOR)                                                \
-do {                                                                 \
-  if (parser->FOR##_mark) {                                          \
-    parser->FOR##_size += p - parser->FOR##_mark;                    \
-    if (parser->FOR##_size > MAX_FIELD_SIZE) {                       \
-      parser->error = TRUE;                                          \
-      return 0;                                                      \
-    }                                                                \
-    if (parser->on_##FOR) {                                          \
-      callback_return_value = parser->on_##FOR(parser,               \
-        parser->FOR##_mark,                                          \
-        p - parser->FOR##_mark);                                     \
-    }                                                                \
-  }                                                                  \
-} while(0)
-
-#define RESET_PARSER(parser)                                         \
-    parser->chunk_size = 0;                                          \
-    parser->eating = 0;                                              \
-    parser->header_field_mark = NULL;                                \
-    parser->header_value_mark = NULL;                                \
-    parser->query_string_mark = NULL;                                \
-    parser->path_mark = NULL;                                        \
-    parser->uri_mark = NULL;                                         \
-    parser->fragment_mark = NULL;                                    \
-    parser->status_code = 0;                                         \
-    parser->method = 0;                                              \
-    parser->transfer_encoding = HTTP_IDENTITY;                       \
-    parser->version_major = 0;                                       \
-    parser->version_minor = 0;                                       \
-    parser->keep_alive = -1;                                         \
-    parser->content_length = 0;                                      \
-    parser->body_read = 0; 
-
-#define END_REQUEST                                                  \
-do {                                                                 \
-    if (parser->on_message_complete) {                               \
-      callback_return_value =                                        \
-        parser->on_message_complete(parser);                         \
-    }                                                                \
-    RESET_PARSER(parser);                                            \
-} while (0)
-
-#define SKIP_BODY(nskip)                                             \
-do {                                                                 \
-  tmp = (nskip);                                                     \
-  if (parser->on_body && tmp > 0) {                                  \
-    callback_return_value = parser->on_body(parser, p, tmp);         \
-  }                                                                  \
-  if (callback_return_value == 0) {                                  \
-    p += tmp;                                                        \
-    parser->body_read += tmp;                                        \
-    parser->chunk_size -= tmp;                                       \
-    if (0 == parser->chunk_size) {                                   \
-      parser->eating = FALSE;                                        \
-      if (parser->transfer_encoding == HTTP_IDENTITY) {              \
-        END_REQUEST;                                                 \
-      }                                                              \
-    } else {                                                         \
-      parser->eating = TRUE;                                         \
-    }                                                                \
-  }                                                                  \
-} while (0)
-
-%%{
-  machine http_parser;
-
-  action mark_header_field {
-    parser->header_field_mark = p;
-    parser->header_field_size = 0;
-  }
-
-  action mark_header_value {
-    parser->header_value_mark = p;
-    parser->header_value_size = 0;
-  }
-
-  action mark_fragment {
-    parser->fragment_mark = p;
-    parser->fragment_size = 0;
-  }
-
-  action mark_query_string {
-    parser->query_string_mark = p;
-    parser->query_string_size = 0;
-  }
-
-  action mark_request_path {
-    parser->path_mark = p;
-    parser->path_size = 0;
-  }
-
-  action mark_request_uri {
-    parser->uri_mark = p;
-    parser->uri_size = 0;
-  }
-
-  action header_field {
-    CALLBACK(header_field);
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->header_field_mark = NULL;
-    parser->header_field_size = 0;
-  }
-
-  action header_value {
-    CALLBACK(header_value);
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->header_value_mark = NULL;
-    parser->header_value_size = 0;
-  }
-
-  action request_uri { 
-    CALLBACK(uri);
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->uri_mark = NULL;
-    parser->uri_size = 0;
-  }
-
-  action fragment { 
-    CALLBACK(fragment);
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->fragment_mark = NULL;
-    parser->fragment_size = 0;
-  }
-
-  action query_string { 
-    CALLBACK(query_string);
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->query_string_mark = NULL;
-    parser->query_string_size = 0;
-  }
-
-  action request_path {
-    CALLBACK(path);
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->path_mark = NULL;
-    parser->path_size = 0;
-  }
-
-  action headers_complete {
-    if(parser->on_headers_complete) {
-      callback_return_value = parser->on_headers_complete(parser);
-      if (callback_return_value != 0) {
-        parser->error = TRUE;
-        return 0;
-      }
-    }
-  }
-
-  action begin_message {
-    if(parser->on_message_begin) {
-      callback_return_value = parser->on_message_begin(parser);
-      if (callback_return_value != 0) {
-        parser->error = TRUE;
-        return 0;
-      }
-    }
-  }
-
-  action content_length {
-    if (parser->content_length > INT_MAX) {
-      parser->error = TRUE;
-      return 0;
-    }
-    parser->content_length *= 10;
-    parser->content_length += *p - '0';
-  }
-
-  action status_code {
-    parser->status_code *= 10;
-    parser->status_code += *p - '0';
-  }
-
-  action use_identity_encoding { parser->transfer_encoding = HTTP_IDENTITY; }
-  action use_chunked_encoding  { parser->transfer_encoding = HTTP_CHUNKED;  }
-
-  action set_keep_alive { parser->keep_alive = TRUE; }
-  action set_not_keep_alive { parser->keep_alive = FALSE; }
-
-  action version_major {
-    parser->version_major *= 10;
-    parser->version_major += *p - '0';
-  }
-
-  action version_minor {
-    parser->version_minor *= 10;
-    parser->version_minor += *p - '0';
-  }
-
-  action add_to_chunk_size {
-    parser->chunk_size *= 16;
-    parser->chunk_size += unhex[(int)*p];
-  }
-
-  action skip_chunk_data {
-    SKIP_BODY(MIN(parser->chunk_size, REMAINING));
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-
-    fhold; 
-    if (parser->chunk_size > REMAINING) {
-      fbreak;
-    } else {
-      fgoto chunk_end; 
-    }
-  }
-
-  action end_chunked_body {
-    END_REQUEST;
-    if (parser->type == HTTP_REQUEST) {
-      fnext Requests;
-    } else {
-      fnext Responses;
-    }
-  }
-
-  action body_logic {
-    if (parser->transfer_encoding == HTTP_CHUNKED) {
-      fnext ChunkedBody;
-    } else {
-      /* this is pretty stupid. i'd prefer to combine this with skip_chunk_data */
-      parser->chunk_size = parser->content_length;
-      p += 1;  
-
-      SKIP_BODY(MIN(REMAINING, parser->content_length));
-
-      if (callback_return_value != 0) {
-        parser->error = TRUE;
-        return 0;
-      }
-
-      fhold;
-      if(parser->chunk_size > REMAINING) {
-        fbreak;
-      }
-    }
-  }
-
-  CRLF = "\r\n";
-
-# character types
-  CTL = (cntrl | 127);
-  safe = ("$" | "-" | "_" | ".");
-  extra = ("!" | "*" | "'" | "(" | ")" | ",");
-  reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
-  unsafe = (CTL | " " | "\"" | "#" | "%" | "<" | ">");
-  national = any -- (alpha | digit | reserved | extra | safe | unsafe);
-  unreserved = (alpha | digit | safe | extra | national);
-  escape = ("%" xdigit xdigit);
-  uchar = (unreserved | escape);
-  pchar = (uchar | ":" | "@" | "&" | "=" | "+");
-  tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" 
-              | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
-
-# elements
-  token = (ascii -- (CTL | tspecials));
-  quote = "\"";
-#  qdtext = token -- "\""; 
-#  quoted_pair = "\" ascii;
-#  quoted_string = "\"" (qdtext | quoted_pair )* "\"";
-
-#  headers
-
-  Method = ( "COPY"      %{ parser->method = HTTP_COPY;      }
-           | "DELETE"    %{ parser->method = HTTP_DELETE;    }
-           | "GET"       %{ parser->method = HTTP_GET;       }
-           | "HEAD"      %{ parser->method = HTTP_HEAD;      }
-           | "LOCK"      %{ parser->method = HTTP_LOCK;      }
-           | "MKCOL"     %{ parser->method = HTTP_MKCOL;     }
-           | "MOVE"      %{ parser->method = HTTP_MOVE;      }
-           | "OPTIONS"   %{ parser->method = HTTP_OPTIONS;   }
-           | "POST"      %{ parser->method = HTTP_POST;      }
-           | "PROPFIND"  %{ parser->method = HTTP_PROPFIND;  }
-           | "PROPPATCH" %{ parser->method = HTTP_PROPPATCH; }
-           | "PUT"       %{ parser->method = HTTP_PUT;       }
-           | "TRACE"     %{ parser->method = HTTP_TRACE;     }
-           | "UNLOCK"    %{ parser->method = HTTP_UNLOCK;    }
-           ); # Not allowing extension methods
-
-  HTTP_Version = "HTTP/" digit $version_major "." digit $version_minor;
-
-  scheme = ( alpha | digit | "+" | "-" | "." )* ;
-  absolute_uri = (scheme ":" (uchar | reserved )*);
-  path = ( pchar+ ( "/" pchar* )* ) ;
-  query = ( uchar | reserved )* >mark_query_string %query_string ;
-  param = ( pchar | "/" )* ;
-  params = ( param ( ";" param )* ) ;
-  rel_path = ( path? (";" params)? ) ;
-  absolute_path = ( "/"+ rel_path ) >mark_request_path %request_path ("?" query)?;
-  Request_URI = ( "*" | absolute_uri | absolute_path ) >mark_request_uri %request_uri;
-  Fragment = ( uchar | reserved )* >mark_fragment %fragment;
-
-  field_name = ( token -- ":" )+;
-  Field_Name = field_name >mark_header_field %header_field;
-
-  field_value = ((any - " ") any*)?;
-  Field_Value = field_value >mark_header_value %header_value;
-
-  hsep = ":" " "*;
-  header = (field_name hsep field_value) :> CRLF;
-  Header = ( ("Content-Length"i hsep digit+ $content_length)
-           | ("Connection"i hsep 
-               ( "Keep-Alive"i %set_keep_alive
-               | "close"i %set_not_keep_alive
-               )
-             )
-           | ("Transfer-Encoding"i %use_chunked_encoding hsep "identity" %use_identity_encoding)
-           | (Field_Name hsep Field_Value)
-           ) :> CRLF;
-
-  Headers = (Header)* :> CRLF @headers_complete;
-
-  Request_Line = ( Method " " Request_URI ("#" Fragment)? " " HTTP_Version CRLF ) ;
-
-  StatusCode = (digit digit digit) $status_code;
-  ReasonPhrase =  ascii* -- ("\r" | "\n");
-  StatusLine = HTTP_Version  " " StatusCode (" " ReasonPhrase)? CRLF;
-
-# chunked message
-  trailing_headers = header*;
-  #chunk_ext_val   = token | quoted_string;
-  chunk_ext_val = token*;
-  chunk_ext_name = token*;
-  chunk_extension = ( ";" " "* chunk_ext_name ("=" chunk_ext_val)? )*;
-  last_chunk = "0"+ chunk_extension CRLF;
-  chunk_size = (xdigit* [1-9a-fA-F] xdigit*) $add_to_chunk_size;
-  chunk_end  = CRLF;
-  chunk_body = any >skip_chunk_data;
-  chunk_begin = chunk_size chunk_extension CRLF;
-  chunk = chunk_begin chunk_body chunk_end;
-  ChunkedBody := chunk* last_chunk trailing_headers CRLF @end_chunked_body;
-
-  Request = (Request_Line Headers) >begin_message @body_logic;
-  Response = (StatusLine Headers) >begin_message @body_logic;
-
-  Requests := Request*;
-  Responses := Response*;
-
-  main := any >{
-    fhold;
-    if (parser->type == HTTP_REQUEST) {
-      fgoto Requests;
-    } else {
-      fgoto Responses;
-    }
-  };
-
-}%%
-
-%% write data;
-
-void
-http_parser_init (http_parser *parser, enum http_parser_type type) 
-{
-  int cs = 0;
-  %% write init;
-  parser->cs = cs;
-  parser->type = type;
-  parser->error = 0;
-
-  parser->on_message_begin = NULL;
-  parser->on_path = NULL;
-  parser->on_query_string = NULL;
-  parser->on_uri = NULL;
-  parser->on_fragment = NULL;
-  parser->on_header_field = NULL;
-  parser->on_header_value = NULL;
-  parser->on_headers_complete = NULL;
-  parser->on_body = NULL;
-  parser->on_message_complete = NULL;
-
-  RESET_PARSER(parser);
-}
-
-/** exec **/
-size_t
-http_parser_execute (http_parser *parser, const char *buffer, size_t len)
-{
-  size_t tmp; // REMOVE ME this is extremely hacky
-  int callback_return_value = 0;
-  const char *p, *pe;
-  int cs = parser->cs;
-
-  p = buffer;
-  pe = buffer+len;
-
-  if (0 < parser->chunk_size && parser->eating) {
-    /* eat body */
-    SKIP_BODY(MIN(len, parser->chunk_size));
-    if (callback_return_value != 0) {
-      parser->error = TRUE;
-      return 0;
-    }
-  }
-
-  if (parser->header_field_mark)   parser->header_field_mark   = buffer;
-  if (parser->header_value_mark)   parser->header_value_mark   = buffer;
-  if (parser->fragment_mark)       parser->fragment_mark       = buffer;
-  if (parser->query_string_mark)   parser->query_string_mark   = buffer;
-  if (parser->path_mark)           parser->path_mark           = buffer;
-  if (parser->uri_mark)            parser->uri_mark            = buffer;
-
-  %% write exec;
-
-  parser->cs = cs;
-
-  CALLBACK(header_field);
-  CALLBACK(header_value);
-  CALLBACK(fragment);
-  CALLBACK(query_string);
-  CALLBACK(path);
-  CALLBACK(uri);
-
-  assert(p <= pe && "buffer overflow after parsing execute");
-  return(p - buffer);
-}
-
-int
-http_parser_has_error (http_parser *parser) 
-{
-  if (parser->error) return TRUE;
-  return parser->cs == http_parser_error;
-}
-
-int
-http_parser_should_keep_alive (http_parser *parser)
-{
-  if (parser->keep_alive == -1)
-    if (parser->version_major == 1)
-      return (parser->version_minor != 0);
-    else if (parser->version_major == 0)
-      return FALSE;
-    else
-      return TRUE;
-  else
-    return parser->keep_alive;
-}
--- a/deps/http_parser/test.c
+++ b/deps/http_parser/test.c
--- a/deps/libeio/Changes
+++ b/deps/libeio/Changes
@@ -1,19 +0,0 @@
-Revision history for libeio
-
-TODO: maybe add mincore support? available on at leats darwin, solaris, linux, freebsd
-
-1.0
-        - readdir: correctly handle malloc failures.
-        - readdir: new flags argument, can return inode
-          and possibly filetype, can sort in various ways.
-        - readdir: stop immediately when cancelled, do
-          not continue reading the directory.
-        - fix return value of eio_sendfile_sync.
-        - include sys/mman.h for msync.
-	- added EIO_STACKSIZE.
-	- added msync, mtouch support (untested).
-        - added sync_file_range (untested).
-        - fixed custom support.
-        - use a more robust feed-add detection method.
-	- "outbundled" from IO::AIO.
-
--- a/deps/libeio/Makefile.am
+++ b/deps/libeio/Makefile.am
@@ -1,15 +0,0 @@
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-VERSION_INFO = 1:0
-
-EXTRA_DIST = LICENSE Changes autogen.sh
-
-#man_MANS = ev.3
-
-include_HEADERS = eio.h
-
-lib_LTLIBRARIES = libeio.la
-
-libeio_la_SOURCES = eio.c xthread.h config.h
-libeio_la_LDFLAGS = -version-info $(VERSION_INFO)
-
--- a/deps/libeio/aclocal.m4
+++ b/deps/libeio/aclocal.m4
--- a/deps/libeio/autogen.sh
+++ b/deps/libeio/autogen.sh
@@ -1,5 +0,0 @@
-libtoolize
-aclocal
-automake --add-missing
-autoconf
-autoheader
--- a/deps/libeio/config.h.in
+++ b/deps/libeio/config.h.in
@@ -1,73 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* fdatasync(2) is available */
-#undef HAVE_FDATASYNC
-
-/* futimes(2) is available */
-#undef HAVE_FUTIMES
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* pread(2) and pwrite(2) are available */
-#undef HAVE_PREADWRITE
-
-/* readahead(2) is available (linux) */
-#undef HAVE_READAHEAD
-
-/* sendfile(2) is available and supported */
-#undef HAVE_SENDFILE
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* sync_file_range(2) is available */
-#undef HAVE_SYNC_FILE_RANGE
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
--- a/deps/libeio/configure.ac
+++ b/deps/libeio/configure.ac
@@ -1,22 +0,0 @@
-AC_PREREQ(2.59)
-AC_INIT
-AC_CONFIG_SRCDIR([eio.h])
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE(libeio,1.0)
-AM_MAINTAINER_MODE
-AC_PROG_LIBTOOL
-
-AC_PROG_CC
-
-if test "x$GCC" = xyes ; then
-  CFLAGS="$CFLAGS -O3"
-fi
-
-dnl somebody will forgive me
-CFLAGS="-D_GNU_SOURCE"
-
-m4_include([libeio.m4])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
--- a/deps/libeio/eio.c
+++ b/deps/libeio/eio.c
--- a/deps/libeio/eio.h
+++ b/deps/libeio/eio.h
@@ -1,292 +0,0 @@
-/*
- * libeio API header
- *
- * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
- * CIAL, 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 OTH-
- * ERWISE) 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 file 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 file
- * 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. If you do not delete the
- * provisions above, a recipient may use your version of this file under
- * either the BSD or the GPL.
- */
-
-#ifndef EIO_H_
-#define EIO_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <sys/types.h>
-
-typedef struct eio_req    eio_req;
-typedef struct eio_dirent eio_dirent;
-
-typedef int (*eio_cb)(eio_req *req);
-
-#ifndef EIO_REQ_MEMBERS
-# define EIO_REQ_MEMBERS
-#endif
-
-#ifndef EIO_STRUCT_STAT
-# define EIO_STRUCT_STAT struct stat
-#endif
-
-/* for readdir */
-
-/* eio_readdir flags */
-enum {
-  EIO_READDIR_DENTS         = 0x01, /* ptr2 contains eio_dirents, not just the (unsorted) names */
-  EIO_READDIR_DIRS_FIRST    = 0x02, /* dirents gets sorted into a good stat() ing order to find directories first */
-  EIO_READDIR_STAT_ORDER    = 0x04, /* dirents gets sorted into a good stat() ing order to quickly stat all files */
-  EIO_READDIR_FOUND_UNKNOWN = 0x80, /* set by eio_readdir when *_ARRAY was set and any TYPE=UNKNOWN's were found */
-
-  EIO_READDIR_CUSTOM1       = 0x100, /* for use by apps */
-  EIO_READDIR_CUSTOM2       = 0x200  /* for use by apps */
-};
-
-/* using "typical" values in the hope that the compiler will do something sensible */
-enum eio_dtype {
-  EIO_DT_UNKNOWN =  0,
-  EIO_DT_FIFO    =  1,
-  EIO_DT_CHR     =  2,
-  EIO_DT_MPC     =  3, /* multiplexed char device (v7+coherent) */
-  EIO_DT_DIR     =  4,
-  EIO_DT_NAM     =  5, /* xenix special named file */
-  EIO_DT_BLK     =  6,
-  EIO_DT_MPB     =  7, /* multiplexed block device (v7+coherent) */
-  EIO_DT_REG     =  8,
-  EIO_DT_NWK     =  9, /* HP-UX network special */
-  EIO_DT_CMP     =  9, /* VxFS compressed */
-  EIO_DT_LNK     = 10,
-  /*  DT_SHAD    = 11,*/
-  EIO_DT_SOCK    = 12,
-  EIO_DT_DOOR    = 13, /* solaris door */
-  EIO_DT_WHT     = 14,
-  EIO_DT_MAX     = 15  /* highest DT_VALUE ever, hopefully */
-};
-
-struct eio_dirent {
-  int nameofs; /* offset of null-terminated name string in (char *)req->ptr2 */
-  unsigned short namelen; /* size of filename without trailing 0 */
-  unsigned char type; /* one of EIO_DT_* */
-  signed char score; /* internal use */
-  ino_t inode; /* the inode number, if available, otherwise unspecified */
-};
-
-/* eio_sync_file_range flags */
-
-enum {
-  EIO_SYNC_FILE_RANGE_WAIT_BEFORE = 1,
-  EIO_SYNC_FILE_RANGE_WRITE       = 2,
-  EIO_SYNC_FILE_RANGE_WAIT_AFTER  = 4
-};
-
-typedef double eio_tstamp; /* feel free to use double in your code directly */
-
-/* the eio request structure */
-
-enum {
-  EIO_CUSTOM,
-  EIO_OPEN, EIO_CLOSE, EIO_DUP2,
-  EIO_READ, EIO_WRITE,
-  EIO_READAHEAD, EIO_SENDFILE,
-  EIO_STAT, EIO_LSTAT, EIO_FSTAT,
-  EIO_TRUNCATE, EIO_FTRUNCATE,
-  EIO_UTIME, EIO_FUTIME,
-  EIO_CHMOD, EIO_FCHMOD,
-  EIO_CHOWN, EIO_FCHOWN,
-  EIO_SYNC, EIO_FSYNC, EIO_FDATASYNC,
-  EIO_MSYNC, EIO_MTOUCH, EIO_SYNC_FILE_RANGE,
-  EIO_UNLINK, EIO_RMDIR, EIO_MKDIR, EIO_RENAME,
-  EIO_MKNOD, EIO_READDIR,
-  EIO_LINK, EIO_SYMLINK, EIO_READLINK,
-  EIO_GROUP, EIO_NOP,
-  EIO_BUSY
-};
-
-/* eio request structure */
-/* this structure is mostly read-only */
-/* when initialising it, all members must be zero-initialised */
-struct eio_req
-{
-  eio_req volatile *next; /* private ETP */
-
-  ssize_t result;  /* result of syscall, e.g. result = read (... */
-  off_t offs;      /* read, write, truncate, readahead, sync_file_range: file offset */
-  size_t size;     /* read, write, readahead, sendfile, msync, sync_file_range: length */
-  void *ptr1;      /* all applicable requests: pathname, old name; readdir: optional eio_dirents */
-  void *ptr2;      /* all applicable requests: new name or memory buffer; readdir: name strings */
-  eio_tstamp nv1;  /* utime, futime: atime; busy: sleep time */
-  eio_tstamp nv2;  /* utime, futime: mtime */
-
-  int type;        /* EIO_xxx constant ETP */
-  int int1;        /* all applicable requests: file descriptor; sendfile: output fd; open, msync, readdir: flags */
-  long int2;       /* chown, fchown: uid; sendfile: input fd; open, chmod, mkdir, mknod: file mode, sync_file_range: flags */
-  long int3;       /* chown, fchown: gid; mknod: dev_t */
-  int errorno;     /* errno value on syscall return */
-
-  unsigned char flags; /* private */
-  signed char pri;     /* the priority */
-
-  void *data;
-  eio_cb finish;
-  void (*destroy)(eio_req *req); /* called when requets no longer needed */
-  void (*feed)(eio_req *req);    /* only used for group requests */
-
-  EIO_REQ_MEMBERS
-
-  eio_req *grp, *grp_prev, *grp_next, *grp_first; /* private */
-};
-
-/* _private_ flags */
-enum {
-  EIO_FLAG_CANCELLED = 0x01, /* request was cancelled */
-  EIO_FLAG_PTR1_FREE = 0x02, /* need to free(ptr1) */
-  EIO_FLAG_PTR2_FREE = 0x04, /* need to free(ptr2) */
-  EIO_FLAG_GROUPADD  = 0x08  /* some request was added to the group */
-};
-
-enum {
-  EIO_PRI_MIN     = -4,
-  EIO_PRI_MAX     =  4,
-  EIO_PRI_DEFAULT =  0,
-};
-
-/* returns < 0 on error, errno set
- * need_poll, if non-zero, will be called when results are available
- * and eio_poll_cb needs to be invoked (it MUST NOT call eio_poll_cb itself).
- * done_poll is called when the need to poll is gone.
- */
-int eio_init (void (*want_poll)(void), void (*done_poll)(void));
-
-/* must be called regularly to handle pending requests */
-/* returns 0 if all requests were handled, -1 if not, or the value of EIO_FINISH if != 0 */
-int eio_poll (void);
-
-/* stop polling if poll took longer than duration seconds */
-void eio_set_max_poll_time (eio_tstamp nseconds);
-/* do not handle more then count requests in one call to eio_poll_cb */
-void eio_set_max_poll_reqs (unsigned int nreqs);
-
-/* set minimum required number
- * maximum wanted number
- * or maximum idle number of threads */
-void eio_set_min_parallel (unsigned int nthreads);
-void eio_set_max_parallel (unsigned int nthreads);
-void eio_set_max_idle     (unsigned int nthreads);
-
-unsigned int eio_nreqs    (void); /* number of requests in-flight */
-unsigned int eio_nready   (void); /* number of not-yet handled requests */
-unsigned int eio_npending (void); /* numbe rof finished but unhandled requests */
-unsigned int eio_nthreads (void); /* number of worker threads in use currently */
-
-/*****************************************************************************/
-/* convinience wrappers */
-
-#ifndef EIO_NO_WRAPPERS
-eio_req *eio_nop       (int pri, eio_cb cb, void *data); /* does nothing except go through the whole process */
-eio_req *eio_busy      (eio_tstamp delay, int pri, eio_cb cb, void *data); /* ties a thread for this long, simulating busyness */
-eio_req *eio_sync      (int pri, eio_cb cb, void *data);
-eio_req *eio_fsync     (int fd, int pri, eio_cb cb, void *data);
-eio_req *eio_fdatasync (int fd, int pri, eio_cb cb, void *data);
-eio_req *eio_msync     (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data);
-eio_req *eio_mtouch    (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data);
-eio_req *eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data);
-eio_req *eio_close     (int fd, int pri, eio_cb cb, void *data);
-eio_req *eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data);
-eio_req *eio_read      (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data);
-eio_req *eio_write     (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data);
-eio_req *eio_fstat     (int fd, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
-eio_req *eio_futime    (int fd, eio_tstamp atime, eio_tstamp mtime, int pri, eio_cb cb, void *data);
-eio_req *eio_ftruncate (int fd, off_t offset, int pri, eio_cb cb, void *data);
-eio_req *eio_fchmod    (int fd, mode_t mode, int pri, eio_cb cb, void *data);
-eio_req *eio_fchown    (int fd, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data);
-eio_req *eio_dup2      (int fd, int fd2, int pri, eio_cb cb, void *data);
-eio_req *eio_sendfile  (int out_fd, int in_fd, off_t in_offset, size_t length, int pri, eio_cb cb, void *data);
-eio_req *eio_open      (const char *path, int flags, mode_t mode, int pri, eio_cb cb, void *data);
-eio_req *eio_utime     (const char *path, eio_tstamp atime, eio_tstamp mtime, int pri, eio_cb cb, void *data);
-eio_req *eio_truncate  (const char *path, off_t offset, int pri, eio_cb cb, void *data);
-eio_req *eio_chown     (const char *path, uid_t uid, gid_t gid, int pri, eio_cb cb, void *data);
-eio_req *eio_chmod     (const char *path, mode_t mode, int pri, eio_cb cb, void *data);
-eio_req *eio_mkdir     (const char *path, mode_t mode, int pri, eio_cb cb, void *data);
-eio_req *eio_readdir   (const char *path, int flags, int pri, eio_cb cb, void *data); /* result=ptr2 allocated dynamically */
-eio_req *eio_rmdir     (const char *path, int pri, eio_cb cb, void *data);
-eio_req *eio_unlink    (const char *path, int pri, eio_cb cb, void *data);
-eio_req *eio_readlink  (const char *path, int pri, eio_cb cb, void *data); /* result=ptr2 allocated dynamically */
-eio_req *eio_stat      (const char *path, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
-eio_req *eio_lstat     (const char *path, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
-eio_req *eio_mknod     (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data);
-eio_req *eio_link      (const char *path, const char *new_path, int pri, eio_cb cb, void *data);
-eio_req *eio_symlink   (const char *path, const char *new_path, int pri, eio_cb cb, void *data);
-eio_req *eio_rename    (const char *path, const char *new_path, int pri, eio_cb cb, void *data);
-eio_req *eio_custom    (eio_cb execute, int pri, eio_cb cb, void *data);
-#endif
-
-/*****************************************************************************/
-/* groups */
-
-eio_req *eio_grp       (eio_cb cb, void *data);
-void eio_grp_feed      (eio_req *grp, void (*feed)(eio_req *req), int limit);
-void eio_grp_limit     (eio_req *grp, int limit);
-void eio_grp_add       (eio_req *grp, eio_req *req);
-void eio_grp_cancel    (eio_req *grp); /* cancels all sub requests but not the group */
-
-/*****************************************************************************/
-/* request api */
-
-/* true if the request was cancelled, useful in the invoke callback */
-#define EIO_CANCELLED(req) ((req)->flags & EIO_FLAG_CANCELLED)
-
-#define EIO_RESULT(req)    ((req)->result)
-/* returns a pointer to the result buffer allocated by eio */
-#define EIO_BUF(req)       ((req)->ptr2)
-#define EIO_STAT_BUF(req)  ((EIO_STRUCT_STAT *)EIO_BUF(req))
-#define EIO_PATH(req)      ((char *)(req)->ptr1)
-
-/* submit a request for execution */
-void eio_submit (eio_req *req);
-/* cancel a request as soon fast as possible, if possible */
-void eio_cancel (eio_req *req);
-/* destroy a request that has never been submitted */
-void eio_destroy (eio_req *req);
-
-/*****************************************************************************/
-/* convinience functions */
-
-ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
--- a/deps/libeio/eio.pod
+++ b/deps/libeio/eio.pod
@@ -1,303 +0,0 @@
-=head1 NAME
-
-libeio - truly asynchronous POSIX I/O
-
-=head1 SYNOPSIS
-
-  #include <eio.h>
-
-=head1 DESCRIPTION
-
-The newest version of this document is also available as an html-formatted
-web page you might find easier to navigate when reading it for the first
-time: L<http://pod.tst.eu/http://cvs.schmorp.de/libeio/eio.pod>.
-
-Note that this library is a by-product of the C<IO::AIO> perl
-module, and many of the subtler points regarding requets lifetime
-and so on are only documented in its documentation at the
-moment: L<http://pod.tst.eu/http://cvs.schmorp.de/IO-AIO/AIO.pm>.
-
-=head2 FEATURES
-
-This library provides fully asynchronous versions of most POSIX functions
-dealign with I/O. Unlike most asynchronous libraries, this not only
-includes C<read> and C<write>, but also C<open>, C<stat>, C<unlink> and
-similar functions, as well as less rarely ones such as C<mknod>, C<futime>
-or C<readlink>.
-
-It also offers wrappers around C<sendfile> (Solaris, Linux, HP-UX and
-FreeBSD, with emulation on other platforms) and C<readahead> (Linux, with
-emulation elsewhere>).
-
-The goal is to enbale you to write fully non-blocking programs. For
-example, in a game server, you would not want to freeze for a few seconds
-just because the server is running a backup and you happen to call
-C<readdir>.
-
-=head2 TIME REPRESENTATION
-
-Libeio represents time as a single floating point number, representing the
-(fractional) number of seconds since the (POSIX) epoch (somewhere near
-the beginning of 1970, details are complicated, don't ask). This type is
-called C<eio_tstamp>, but it is guarenteed to be of type C<double> (or
-better), so you can freely use C<double> yourself.
-
-Unlike the name component C<stamp> might indicate, it is also used for
-time differences throughout libeio.
-
-=head2 FORK SUPPORT
-
-Calling C<fork ()> is fully supported by this module. It is implemented in these steps:
-
-   1. wait till all requests in "execute" state have been handled
-      (basically requests that are already handed over to the kernel).
-   2. fork
-   3. in the parent, continue business as usual, done
-   4. in the child, destroy all ready and pending requests and free the
-      memory used by the worker threads. This gives you a fully empty
-      libeio queue.
-
-=head1 INITIALISATION/INTEGRATION
-
-Before you can call any eio functions you first have to initialise the
-library. The library integrates into any event loop, but can also be used
-without one, including in polling mode.
-
-You have to provide the necessary glue yourself, however.
-
-=over 4
-
-=item int eio_init (void (*want_poll)(void), void (*done_poll)(void))
-
-This function initialises the library. On success it returns C<0>, on
-failure it returns C<-1> and sets C<errno> appropriately.
-
-It accepts two function pointers specifying callbacks as argument, both of
-which can be C<0>, in which case the callback isn't called.
-
-=item want_poll callback
-
-The C<want_poll> callback is invoked whenever libeio wants attention (i.e.
-it wants to be polled by calling C<eio_poll>). It is "edge-triggered",
-that is, it will only be called once when eio wants attention, until all
-pending requests have been handled.
-
-This callback is called while locks are being held, so I<you must
-not call any libeio functions inside this callback>. That includes
-C<eio_poll>. What you should do is notify some other thread, or wake up
-your event loop, and then call C<eio_poll>.
-
-=item done_poll callback
-
-This callback is invoked when libeio detects that all pending requests
-have been handled. It is "edge-triggered", that is, it will only be
-called once after C<want_poll>. To put it differently, C<want_poll> and
-C<done_poll> are invoked in pairs: after C<want_poll> you have to call
-C<eio_poll ()> until either C<eio_poll> indicates that everything has been
-handled or C<done_poll> has been called, which signals the same.
-
-Note that C<eio_poll> might return after C<done_poll> and C<want_poll>
-have been called again, so watch out for races in your code.
-
-As with C<want_poll>, this callback is called while lcoks are being held,
-so you I<must not call any libeio functions form within this callback>.
-
-=item int eio_poll ()
-
-This function has to be called whenever there are pending requests that
-need finishing. You usually call this after C<want_poll> has indicated
-that you should do so, but you can also call this function regularly to
-poll for new results.
-
-If any request invocation returns a non-zero value, then C<eio_poll ()>
-immediately returns with that value as return value.
-
-Otherwise, if all requests could be handled, it returns C<0>. If for some
-reason not all requests have been handled, i.e. some are still pending, it
-returns C<-1>.
-
-=back
-
-For libev, you would typically use an C<ev_async> watcher: the
-C<want_poll> callback would invoke C<ev_async_send> to wake up the event
-loop. Inside the callback set for the watcher, one would call C<eio_poll
-()> (followed by C<ev_async_send> again if C<eio_poll> indicates that not
-all requests have been handled yet). The race is taken care of because
-libev resets/rearms the async watcher before calling your callback,
-and therefore, before calling C<eio_poll>. This might result in (some)
-spurious wake-ups, but is generally harmless.
-
-For most other event loops, you would typically use a pipe - the event
-loop should be told to wait for read readyness on the read end. In
-C<want_poll> you would write a single byte, in C<done_poll> you would try
-to read that byte, and in the callback for the read end, you would call
-C<eio_poll>. The race is avoided here because the event loop should invoke
-your callback again and again until the byte has been read (as the pipe
-read callback does not read it, only C<done_poll>).
-
-=head2 CONFIGURATION
-
-The functions in this section can sometimes be useful, but the default
-configuration will do in most case, so you should skip this section on
-first reading.
-
-=over 4
-
-=item eio_set_max_poll_time (eio_tstamp nseconds)
-
-This causes C<eio_poll ()> to return after it has detected that it was
-running for C<nsecond> seconds or longer (this number can be fractional).
-
-This can be used to limit the amount of time spent handling eio requests,
-for example, in interactive programs, you might want to limit this time to
-C<0.01> seconds or so.
-
-Note that:
-
-a) libeio doesn't know how long your request callbacks take, so the time
-spent in C<eio_poll> is up to one callback invocation longer then this
-interval.
-
-b) this is implemented by calling C<gettimeofday> after each request,
-which can be costly.
-
-c) at least one request will be handled.
-
-=item eio_set_max_poll_reqs (unsigned int nreqs)
-
-When C<nreqs> is non-zero, then C<eio_poll> will not handle more than
-C<nreqs> requests per invocation. This is a less costly way to limit the
-amount of work done by C<eio_poll> then setting a time limit.
-
-If you know your callbacks are generally fast, you could use this to
-encourage interactiveness in your programs by setting it to C<10>, C<100>
-or even C<1000>.
-
-=item eio_set_min_parallel (unsigned int nthreads)
-
-Make sure libeio can handle at least this many requests in parallel. It
-might be able handle more.
-
-=item eio_set_max_parallel (unsigned int nthreads)
-
-Set the maximum number of threads that libeio will spawn.
-
-=item eio_set_max_idle (unsigned int nthreads)
-
-Libeio uses threads internally to handle most requests, and will start and stop threads on demand.
-
-This call can be used to limit the number of idle threads (threads without
-work to do): libeio will keep some threads idle in preperation for more
-requests, but never longer than C<nthreads> threads.
-
-In addition to this, libeio will also stop threads when they are idle for
-a few seconds, regardless of this setting.
-
-=item unsigned int eio_nthreads ()
-
-Return the number of worker threads currently running.
-
-=item unsigned int eio_nreqs ()
-
-Return the number of requests currently handled by libeio. This is the
-total number of requests that have been submitted to libeio, but not yet
-destroyed.
-
-=item unsigned int eio_nready ()
-
-Returns the number of ready requests, i.e. requests that have been
-submitted but have not yet entered the execution phase.
-
-=item unsigned int eio_npending ()
-
-Returns the number of pending requests, i.e. requests that have been
-executed and have results, but have not been finished yet by a call to
-C<eio_poll>).
-
-=back
-
-
-=head1 ANATOMY OF AN EIO REQUEST
-
-#TODO
-
-
-=head1 HIGH LEVEL REQUEST API
-
-#TODO
-
-=back
-
-
-=head1 LOW LEVEL REQUEST API
-
-#TODO
-
-=head1 EMBEDDING
-
-Libeio can be embedded directly into programs. This functionality is not
-documented and not (yet) officially supported.
-
-Note that, when including C<libeio.m4>, you are responsible for defining
-the compilation environment (C<_LARGEFILE_SOURCE>, C<_GNU_SOURCE> etc.).
-
-If you need to know how, check the C<IO::AIO> perl module, which does
-exactly that.
-
-
-=head1 COMPILETIME CONFIGURATION
-
-These symbols, if used, must be defined when compiling F<eio.c>.
-
-=over 4
-
-=item EIO_STACKSIZE
-
-This symbol governs the stack size for each eio thread. Libeio itself
-was written to use very little stackspace, but when using C<EIO_CUSTOM>
-requests, you might want to increase this.
-
-If this symbol is undefined (the default) then libeio will use its default
-stack size (C<sizeof (long) * 4096> currently).  If it is defined, but
-C<0>, then the default operating system stack size will be used. In all
-other cases, the value must be an expression that evaluates to the desired
-stack size.
-
-=back
-
-
-=head1 PORTABILITY REQUIREMENTS
-
-In addition to a working ISO-C implementation, libeio relies on a few
-additional extensions:
-
-=over 4
-
-=item POSIX threads
-
-To be portable, this module uses threads, specifically, the POSIX threads
-library must be available (and working, which partially excludes many xBSD
-systems, where C<fork ()> is buggy).
-
-=item POSIX-compatible filesystem API
-
-This is actually a harder portability requirement: The libeio API is quite
-demanding regarding POSIX API calls (symlinks, user/group management
-etc.).
-
-=item C<double> must hold a time value in seconds with enough accuracy
-
-The type C<double> is used to represent timestamps. It is required to
-have at least 51 bits of mantissa (and 9 bits of exponent), which is good
-enough for at least into the year 4000. This requirement is fulfilled by
-implementations implementing IEEE 754 (basically all existing ones).
-
-=back
-
-If you know of other additional requirements drop me a note.
-
-
-=head1 AUTHOR
-
-Marc Lehmann <libeio@schmorp.de>.
-
--- a/deps/libeio/libeio.m4
+++ b/deps/libeio/libeio.m4
@@ -1,107 +0,0 @@
-AC_SEARCH_LIBS(
-   pthread_create,
-   [pthread pthreads pthreadVC2],
-   ,
-   [AC_MSG_ERROR(pthread functions not found)]
-)
-
-AC_CACHE_CHECK(for futimes, ac_cv_futimes, [AC_LINK_IFELSE([[
-#include <sys/types.h>
-#include <sys/time.h>
-#include <utime.h>
-struct timeval tv[2];
-int res;
-int fd;
-int main(void)
-{
-   res = futimes (fd, tv);
-   return 0;
-}
-]],ac_cv_futimes=yes,ac_cv_futimes=no)])
-test $ac_cv_futimes = yes && AC_DEFINE(HAVE_FUTIMES, 1, futimes(2) is available)
-
-AC_CACHE_CHECK(for readahead, ac_cv_readahead, [AC_LINK_IFELSE([
-#include <fcntl.h>
-int main(void)
-{
-   int fd = 0;
-   size_t count = 2;
-   ssize_t res;
-   res = readahead (fd, 0, count);
-   return 0;
-}
-],ac_cv_readahead=yes,ac_cv_readahead=no)])
-test $ac_cv_readahead = yes && AC_DEFINE(HAVE_READAHEAD, 1, readahead(2) is available (linux))
-
-AC_CACHE_CHECK(for fdatasync, ac_cv_fdatasync, [AC_LINK_IFELSE([
-#include <unistd.h>
-int main(void)
-{
-   int fd = 0;
-   fdatasync (fd);
-   return 0;
-}
-],ac_cv_fdatasync=yes,ac_cv_fdatasync=no)])
-test $ac_cv_fdatasync = yes && AC_DEFINE(HAVE_FDATASYNC, 1, fdatasync(2) is available)
-
-AC_CACHE_CHECK(for pread and pwrite, ac_cv_preadwrite, [AC_LINK_IFELSE([
-#include <unistd.h>
-int main(void)
-{
-   int fd = 0;
-   size_t count = 1;
-   char buf;
-   off_t offset = 1;
-   ssize_t res;
-   res = pread (fd, &buf, count, offset);
-   res = pwrite (fd, &buf, count, offset);
-   return 0;
-}
-],ac_cv_preadwrite=yes,ac_cv_preadwrite=no)])
-test $ac_cv_preadwrite = yes && AC_DEFINE(HAVE_PREADWRITE, 1, pread(2) and pwrite(2) are available)
-
-AC_CACHE_CHECK(for sendfile, ac_cv_sendfile, [AC_LINK_IFELSE([
-# include <sys/types.h>
-#if __linux
-# include <sys/sendfile.h>
-#elif __freebsd
-# include <sys/socket.h>
-# include <sys/uio.h>
-#elif __hpux
-# include <sys/socket.h>
-#else
-# error unsupported architecture
-#endif
-int main(void)
-{
-   int fd = 0;
-   off_t offset = 1;
-   size_t count = 2;
-   ssize_t res;
-#if __linux
-   res = sendfile (fd, fd, offset, count);
-#elif __freebsd
-   res = sendfile (fd, fd, offset, count, 0, &offset, 0);
-#elif __hpux
-   res = sendfile (fd, fd, offset, count, 0, 0);
-#endif
-   return 0;
-}
-],ac_cv_sendfile=yes,ac_cv_sendfile=no)])
-test $ac_cv_sendfile = yes && AC_DEFINE(HAVE_SENDFILE, 1, sendfile(2) is available and supported)
-
-AC_CACHE_CHECK(for sync_file_range, ac_cv_sync_file_range, [AC_LINK_IFELSE([
-#include <fcntl.h>
-int main(void)
-{
-   int fd = 0;
-   off64_t offset = 1;
-   off64_t nbytes = 1;
-   unsigned int flags = SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE|SYNC_FILE_RANGE_WAIT_AFTER;
-   ssize_t res;
-   res = sync_file_range (fd, offset, nbytes, flags);
-   return 0;
-}
-],ac_cv_sync_file_range=yes,ac_cv_sync_file_range=no)])
-test $ac_cv_sync_file_range = yes && AC_DEFINE(HAVE_SYNC_FILE_RANGE, 1, sync_file_range(2) is available)
-
--- a/deps/libeio/wscript
+++ b/deps/libeio/wscript
@@ -1,121 +0,0 @@
-import Options
-
-def set_options(opt):
-  pass
-  #opt.tool_options('compiler_cc')
-
-def configure(conf):
-  print "--- libeio ---"
-  #conf.check_tool('compiler_cc')
-
-  conf.check(lib='pthread', uselib_store='PTHREAD')
-  conf.check_cc(lib="pthread", header_name="pthread.h", function_name="pthread_create", mandatory=True)
-  conf.check_cc(lib="pthread", header_name="pthread.h", function_name="pthread_atfork", mandatory=True)
-
-  conf.check_cc(msg="Checking for futimes(2)", define_name="HAVE_FUTIMES", fragment="""
-    #include <sys/types.h>
-    #include <sys/time.h>
-    #include <utime.h>
-    struct timeval tv[2];
-    int res;
-    int fd;
-    int main(void)
-    {
-       res = futimes (fd, tv);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for readahead(2)", define_name="HAVE_READAHEAD", fragment="""
-    #include <fcntl.h>
-    int main(void)
-    {
-       int fd = 0;
-       size_t count = 2;
-       ssize_t res;
-       res = readahead (fd, 0, count);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for fdatasync(2)", define_name="HAVE_FDATASYNC", fragment="""
-    #include <unistd.h>
-    int main(void)
-    {
-       int fd = 0;
-       fdatasync (fd);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for pread(2) and pwrite(2)", define_name="HAVE_PREADWRITE", fragment="""
-    #include <unistd.h>
-    int main(void)
-    {
-       int fd = 0;
-       size_t count = 1;
-       char buf;
-       off_t offset = 1;
-       ssize_t res;
-       res = pread (fd, &buf, count, offset);
-       res = pwrite (fd, &buf, count, offset);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for sendfile(2)" , define_name="HAVE_SENDFILE" , fragment=""" 
-    # include <sys/types.h>
-    #if __linux
-    # include <sys/sendfile.h>
-    #elif __freebsd
-    # include <sys/socket.h>
-    # include <sys/uio.h>
-    #elif __hpux
-    # include <sys/socket.h>
-    #else
-    # error unsupported architecture
-    #endif
-    int main(void)
-    {
-       int fd = 0;
-       off_t offset = 1;
-       size_t count = 2;
-       ssize_t res;
-    #if __linux
-       res = sendfile (fd, fd, offset, count);
-    #elif __freebsd
-       res = sendfile (fd, fd, offset, count, 0, &offset, 0);
-    #elif __hpux
-       res = sendfile (fd, fd, offset, count, 0, 0);
-    #endif
-       return 0;
-    }
-  """)
-
-  conf.env.append_value("CCFLAGS", "-D_GNU_SOURCE")
-  conf.check_cc(msg="Checking for sync_file_range(2) ", fragment="""
-    #include <fcntl.h>
-    int main(void)
-    {
-       int fd = 0;
-       off64_t offset = 1;
-       off64_t nbytes = 1;
-       unsigned int flags = SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE|SYNC_FILE_RANGE_WAIT_AFTER;
-       ssize_t res;
-       res = sync_file_range (fd, offset, nbytes, flags);
-       return 0;
-    }
-  """, define_name="HAVE_SYNC_FILE_RANGE")
-
-def build(bld):
-  libeio = bld.new_task_gen("cc", "staticlib")
-  libeio.source = "eio.c"
-  libeio.target = 'eio'
-  libeio.name = 'eio'
-  libeio.includes = '. ../..'
-  libeio.uselib = "PTHREAD"
-  libeio.install_path = None
-  if bld.env["USE_DEBUG"]:
-    libeio.clone("debug");
-  bld.install_files('${PREFIX}/include/node/', 'eio.h');
-
--- a/deps/libeio/xthread.h
+++ b/deps/libeio/xthread.h
@@ -1,157 +0,0 @@
-#ifndef XTHREAD_H_
-#define XTHREAD_H_
-
-/* whether word reads are potentially non-atomic.
- * this is conservatice, likely most arches this runs
- * on have atomic word read/writes.
- */
-#ifndef WORDACCESS_UNSAFE
-# if __i386 || __x86_64
-#  define WORDACCESS_UNSAFE 0
-# else
-#  define WORDACCESS_UNSAFE 1
-# endif
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef _WIN32
-typedef int ssize_t;
-
-#define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
-#define _WIN32_WINNT 0x400
-#include <stdio.h>//D
-#include <fcntl.h>
-#include <io.h>
-#include <time.h>
-#include <winsock2.h>
-#include <process.h>
-#include <windows.h>
-#include <pthread.h>
-#define sigset_t int
-#define sigfillset(a)
-#define pthread_sigmask(a,b,c)
-#define sigaddset(a,b)
-#define sigemptyset(s)
-#define sigfillset(s)
-
-typedef pthread_mutex_t mutex_t;
-#define X_MUTEX_INIT           PTHREAD_MUTEX_INITIALIZER
-#define X_LOCK(mutex)          pthread_mutex_lock (&(mutex))
-#define X_UNLOCK(mutex)        pthread_mutex_unlock (&(mutex))
-
-typedef pthread_cond_t cond_t;
-#define X_COND_INIT                     PTHREAD_COND_INITIALIZER
-#define X_COND_SIGNAL(cond)             pthread_cond_signal (&(cond))
-#define X_COND_WAIT(cond,mutex)         pthread_cond_wait (&(cond), &(mutex))
-#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
-
-typedef pthread_t thread_t;
-#define X_THREAD_PROC(name) void *name (void *thr_arg)
-#define X_THREAD_ATFORK(a,b,c)
-
-static int
-thread_create (thread_t *tid, void *(*proc)(void *), void *arg)
-{
-  int retval;
-  pthread_attr_t attr;
-
-  pthread_attr_init (&attr);
-  pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-
-  retval = pthread_create (tid, &attr, proc, arg) == 0;
-
-  pthread_attr_destroy (&attr);
-
-  return retval;
-}
-
-#define respipe_read(a,b,c)  PerlSock_recv ((a), (b), (c), 0)
-#define respipe_write(a,b,c) send ((a), (b), (c), 0)
-#define respipe_close(a)     PerlSock_closesocket ((a))
-
-#else
-/////////////////////////////////////////////////////////////////////////////
-
-#if __linux && !defined(_GNU_SOURCE)
-# define _GNU_SOURCE
-#endif
-
-/* just in case */
-#define _REENTRANT 1
-
-#if __solaris
-# define _POSIX_PTHREAD_SEMANTICS 1
-/* try to bribe solaris headers into providing a current pthread API
- * despite environment being configured for an older version.
- */
-# define __EXTENSIONS__ 1
-#endif
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <limits.h>
-#include <pthread.h>
-
-typedef pthread_mutex_t mutex_t;
-#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
-# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-#else
-# define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
-#endif
-#define X_LOCK(mutex)   pthread_mutex_lock   (&(mutex))
-#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
-
-typedef pthread_cond_t cond_t;
-#define X_COND_INIT PTHREAD_COND_INITIALIZER
-#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
-#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
-#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
-
-typedef pthread_t thread_t;
-#define X_THREAD_PROC(name) static void *name (void *thr_arg)
-#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child)
-
-// the broken bsd's once more
-#ifndef PTHREAD_STACK_MIN
-# define PTHREAD_STACK_MIN 0
-#endif
-
-#ifndef X_STACKSIZE
-# define X_STACKSIZE sizeof (long) * 4096
-#endif
-
-static int
-thread_create (thread_t *tid, void *(*proc)(void *), void *arg)
-{
-  int retval;
-  sigset_t fullsigset, oldsigset;
-  pthread_attr_t attr;
-
-  pthread_attr_init (&attr);
-  pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-  pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < X_STACKSIZE ? X_STACKSIZE : PTHREAD_STACK_MIN);
-#ifdef PTHREAD_SCOPE_PROCESS
-  pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
-#endif
-
-  sigfillset (&fullsigset);
-
-  pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
-  retval = pthread_create (tid, &attr, proc, arg) == 0;
-  pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
-
-  pthread_attr_destroy (&attr);
-
-  return retval;
-}
-
-#define respipe_read(a,b,c)  read  ((a), (b), (c))
-#define respipe_write(a,b,c) write ((a), (b), (c))
-#define respipe_close(a)     close ((a))
-
-#endif
-
-#endif
-
--- a/deps/libev/Changes
+++ b/deps/libev/Changes
@@ -1,275 +0,0 @@
-Revision history for libev, a high-performance and full-featured event loop.
-
-3.8  Sun Aug  9 14:30:45 CEST 2009
-	- incompatible change: do not necessarily reset signal handler
-          to SIG_DFL when a sighandler is stopped.
-        - ev_default_destroy did not properly free or zero some members,
-          potentially causing crashes and memory corruption on repated
-          ev_default_destroy/ev_default_loop calls.
-	- take advantage of signalfd on GNU/Linux systems.
-	- document that the signal mask might be in an unspecified
-          state when using libev's signal handling.
-        - take advantage of some GNU/Linux calls to set cloexec/nonblock
-          on fd creation, to avoid race conditions.
-
-3.7  Fri Jul 17 16:36:32 CEST 2009
-	- ev_unloop and ev_loop wrongly used a global variable to exit loops,
-          instead of using a per-loop variable (bug caught by accident...).
-	- the ev_set_io_collect_interval interpretation has changed.
-        - add new functionality: ev_set_userdata, ev_userdata,
-          ev_set_invoke_pending_cb, ev_set_loop_release_cb,
-          ev_invoke_pending, ev_pending_count, together with a long example
-          about thread locking.
-        - add ev_timer_remaining (as requested by Denis F. Latypoff).
-        - add ev_loop_depth.
-        - calling ev_unloop in fork/prepare watchers will no longer poll
-          for new events.
-	- Denis F. Latypoff corrected many typos in example code snippets.
-        - honor autoconf detection of EV_USE_CLOCK_SYSCALL, also double-
-          check that the syscall number is available before trying to
-          use it (reported by ry@tinyclouds).
-        - use GetSystemTimeAsFileTime instead of _timeb on windows, for
-          slightly higher accuracy.
-        - properly declare ev_loop_verify and ev_now_update even when
-          !EV_MULTIPLICITY.
-        - do not compile in any priority code when EV_MAXPRI == EV_MINPRI.
-        - support EV_MINIMAL==2 for a reduced API.
-        - actually 0-initialise struct sigaction when installing signals.
-        - add section on hibernate and stopped processes to ev_timer docs.
-
-3.6  Tue Apr 28 02:49:30 CEST 2009
-	- multiple timers becoming ready within an event loop iteration
-          will be invoked in the "correct" order now.
-	- do not leave the event loop early just because we have no active
-          watchers, fixing a problem when embedding a kqueue loop
-          that has active kernel events but no registered watchers
-          (reported by blacksand blacksand).
-	- correctly zero the idx values for arrays, so destroying and
-          reinitialising the default loop actually works (patch by
-          Malek Hadj-Ali).
-        - implement ev_suspend and ev_resume.
-        - new EV_CUSTOM revents flag for use by applications.
-        - add documentation section about priorites.
-        - add a glossary to the dcoumentation.
-        - extend the ev_fork description slightly.
-        - optimize a jump out of call_pending.
-
-3.53 Sun Feb 15 02:38:20 CET 2009
-	- fix a bug in event pipe creation on win32 that would cause a
-          failed assertion on event loop creation (patch by Malek Hadj-Ali).
-	- probe for CLOCK_REALTIME support at runtime as well and fall
-          back to gettimeofday if there is an error, to support older
-          operating systems with newer header files/libraries.
-        - prefer gettimeofday over clock_gettime with USE_CLOCK_SYSCALL
-          (default most everywhere), otherwise not.
-
-3.52 Wed Jan  7 21:43:02 CET 2009
-	- fix compilation of select backend in fd_set mode when NFDBITS is
-          missing (to get it to compile on QNX, reported by Rodrigo Campos).
-        - better select-nfds handling when select backend is in fd_set mode.
-        - diagnose fd_set overruns when select backend is in fd_set mode.
-        - due to a thinko, instead of disabling everything but
-          select on the borked OS X platform, everything but select was
-          allowed (reported by Emanuele Giaquinta).
-        - actually verify that local and remote port are matching in
-          libev's socketpair emulation, which makes denial-of-service
-          attacks harder (but not impossible - it's windows). Make sure
-          it even works under vista, which thinks that getpeer/sockname
-          should return fantasy port numbers.
-        - include "libev" in all assertion messages for potentially
-          clearer diagnostics.
-        - event_get_version (libevent compatibility) returned
-          a useless string instead of the expected version string
-          (patch by W.C.A. Wijngaards).
-
-3.51 Wed Dec 24 23:00:11 CET 2008
-        - fix a bug where an inotify watcher was added twice, causing
-          freezes on hash collisions (reported and analysed by Graham Leggett).
-	- new config symbol, EV_USE_CLOCK_SYSCALL, to make libev use
-          a direct syscall - slower, but no dependency on librt et al.
-        - assume negative return values != -1 signals success of port_getn
-          (http://cvs.epicsol.org/cgi/viewcvs.cgi/epic5/source/newio.c?rev=1.52)
-          (no known failure reports, but it doesn't hurt).
-        - fork detection in ev_embed now stops and restarts the watcher
-          automatically.
-        - EXPERIMENTAL: default the method to operator () in ev++.h,
-          to make it nicer to use functors (requested by Benedek László).
-        - fixed const object callbacks in ev++.h.
-        - replaced loop_ref argument of watcher.set (loop) by a direct
-          ev_loop * in ev++.h, to avoid clashes with functor patch.
-        - do not try to watch the empty string via inotify.
-        - inotify watchers could be leaked under certain circumstances.
-        - OS X 10.5 is actually even more broken than earlier versions,
-          so fall back to select on that piece of garbage.
-        - fixed some weirdness in the ev_embed documentation.
-
-3.49 Wed Nov 19 11:26:53 CET 2008
-	- ev_stat watchers will now use inotify as a mere hint on
-          kernels <2.6.25, or if the filesystem is not in the
-          "known to be good" list.
-        - better mingw32 compatibility (it's not as borked as native win32)
-          (analysed by Roger Pack).
-        - include stdio.h in the example program, as too many people are
-          confused by the weird C language otherwise. I guess the next thing
-          I get told is that the "..." ellipses in the examples don't compile
-          with their C compiler.
-
-3.48 Thu Oct 30 09:02:37 CET 2008
-	- further optimise away the EPOLL_CTL_ADD/MOD combo in the epoll
-          backend by assuming the kernel event mask hasn't changed if
-          ADD fails with EEXIST.
-        - work around spurious event notification bugs in epoll by using
-          a 32-bit generation counter. recreate kernel state if we receive
-          spurious notifications or unwanted events. this is very costly,
-          but I didn't come up with this horrible design.
-        - use memset to initialise most arrays now and do away with the
-          init functions.
-        - expand time-out strategies into a "Be smart about timeouts" section.
-        - drop the "struct" from all ev_watcher declarations in the
-          documentation and did other clarifications (yeah, it was a mistake
-          to have a struct AND a function called ev_loop).
-	- fix a bug where ev_default would not initialise the default
-          loop again after it was destroyed with ev_default_destroy.
-        - rename syserr to ev_syserr to avoid name clashes when embedding,
-          do similar changes for event.c.
-
-3.45 Tue Oct 21 21:59:26 CEST 2008
-	- disable inotify usage on linux <2.6.25, as it is broken
-          (reported by Yoann Vandoorselaere).
-        - ev_stat errornously would try to add inotify watchers
-          even when inotify wasn't available (this should only
-          have a performance impact).
-	- ev_once now passes both timeout and io to the callback if both
-          occur concurrently, instead of giving timeouts precedence.
-	- disable EV_USE_INOTIFY when sys/inotify.h is too old.
-
-3.44 Mon Sep 29 05:18:39 CEST 2008
-	- embed watchers now automatically invoke ev_loop_fork on the
-          embedded loop when the parent loop forks.
-	- new function: ev_now_update (loop).
-	- verify_watcher was not marked static.
-        - improve the "associating..." manpage section.
-        - documentation tweaks here and there.
-
-3.43 Sun Jul  6 05:34:41 CEST 2008
-	- include more include files on windows to get struct _stati64
-          (reported by Chris Hulbert, but doesn't quite fix his issue).
-	- add missing #include <io.h> in ev.c on windows (reported by
-          Matt Tolton).
-
-3.42 Tue Jun 17 12:12:07 CEST 2008
-	- work around yet another windows bug: FD_SET actually adds fd's
-          multiple times to the fd_*SET*, despite official MSN docs claiming
-          otherwise. Reported and well-analysed by Matt Tolton.
-	- define NFDBITS to 0 when EV_SELECT_IS_WINSOCKET to make it compile
-          (reported any analysed by Chris Hulbert).
-        - fix a bug in ev_ebadf (this function is only used to catch
-          programming errors in the libev user). reported by Matt Tolton.
-        - fix a bug in fd_intern on win32 (could lead to compile errors
-          under some circumstances, but would work correctly if it compiles).
-          reported by Matt Tolton.
-        - (try to) work around missing lstat on windows.
-	- pass in the write fd set as except fd set under windows. windows
-          is so uncontrollably lame that it requires this. this means that
-          switching off oobinline is not supported (but tcp/ip doesn't
-          have oob, so that would be stupid anyways.
-        - use posix module symbol to auto-detect monotonic clock presence
-          and some other default values.
-
-3.41 Fri May 23 18:42:54 CEST 2008
-	- work around an obscure bug in winsocket select: if you
-          provide only empty fd sets then select returns WSAEINVAL. how sucky.
-        - improve timer scheduling stability and reduce use of time_epsilon.
-        - use 1-based 2-heap for EV_MINIMAL, simplifies code, reduces
-          codesize and makes for better cache-efficiency.
-        - use 3-based 4-heap for !EV_MINIMAL. this makes better use
-          of cpu cache lines and gives better growth behaviour than
-          2-based heaps.
-        - cache timestamp within heap for !EV_MINIMAL, to avoid random
-          memory accesses.
-        - document/add EV_USE_4HEAP and EV_HEAP_CACHE_AT.
-        - fix a potential aliasing issue in ev_timer_again.
-        - add/document ev_periodic_at, retract direct access to ->at.
-        - improve ev_stat docs.
-        - add portability requirements section.
-	- fix manpage headers etc.
-        - normalise WSA error codes to lower range on windows.
-        - add consistency check code that can be called automatically
-          or on demand to check for internal structures (ev_loop_verify).
-
-3.31 Wed Apr 16 20:45:04 CEST 2008
-	- added last minute fix for ev_poll.c by Brandon Black.
-
-3.3  Wed Apr 16 19:04:10 CEST 2008
-        - event_base_loopexit should return 0 on success
-          (W.C.A. Wijngaards).
-	- added linux eventfd support.
-        - try to autodetect epoll and inotify support
-          by libc header version if not using autoconf.
-        - new symbols: EV_DEFAULT_UC and EV_DEFAULT_UC_.
-        - declare functions defined in ev.h as inline if
-          C99 or gcc are available.
-        - enable inlining with gcc versions 2 and 3.
-        - work around broken poll implementations potentially
-          not clearing revents field in ev_poll (Brandon Black)
-          (no such systems are known at this time).
-        - work around a bug in realloc on openbsd and darwin,
-          also makes the errornous valgrind complaints
-          go away (noted by various people).
-        - fix ev_async_pending, add c++ wrapper for ev_async
-          (based on patch sent by Johannes Deisenhofer.
-        - add sensible set method to ev::embed.
-        - made integer constants type int in ev.h.
-
-3.2  Wed Apr  2 17:11:19 CEST 2008
-	- fix a 64 bit overflow issue in the select backend,
-          by using fd_mask instead of int for the mask.
-        - rename internal sighandler to avoid clash with very old perls.
-        - entering ev_loop will not clear the ONESHOT or NONBLOCKING
-          flags of any outer loops anymore.
-        - add ev_async_pending.
-
-3.1  Thu Mar 13 13:45:22 CET 2008
-	- implement ev_async watchers.
-        - only initialise signal pipe on demand.
-	- make use of sig_atomic_t configurable.
-        - improved documentation.
-
-3.0  Mon Jan 28 13:14:47 CET 2008
-	- API/ABI bump to version 3.0.
-	- ev++.h includes "ev.h" by default now, not <ev.h>.
-	- slightly improved documentation.
-	- speed up signal detection after a fork.
-        - only optionally return trace status changed in ev_child
-          watchers.
-        - experimental (and undocumented) loop wrappers for ev++.h.
-
-2.01 Tue Dec 25 08:04:41 CET 2007
-	- separate Changes file.
-	- fix ev_path_set => ev_stat_set typo.
-        - remove event_compat.h from the libev tarball.
-        - change how include files are found.
-        - doc updates.
-        - update licenses, explicitly allow for GPL relicensing.
-
-2.0  Sat Dec 22 17:47:03 CET 2007
-        - new ev_sleep, ev_set_(io|timeout)_collect_interval.
-        - removed epoll from embeddable fd set.
-        - fix embed watchers.
-	- renamed ev_embed.loop to other.
-	- added exported Symbol tables.
-        - undefine member wrapper macros at the end of ev.c.
-        - respect EV_H in ev++.h.
-
-1.86 Tue Dec 18 02:36:57 CET 2007
-	- fix memleak on loop destroy (not relevant for perl).
-
-1.85 Fri Dec 14 20:32:40 CET 2007
-        - fix some aliasing issues w.r.t. timers and periodics
-          (not relevant for perl).
-
-(for historic versions refer to EV/Changes, found in the Perl interface)
-
-0.1  Wed Oct 31 21:31:48 CET 2007
-	- original version; hacked together in <24h.
-
--- a/deps/libev/Makefile.am
+++ b/deps/libev/Makefile.am
@@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-VERSION_INFO = 3:0
-
-EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \
-	     ev_vars.h ev_wrap.h \
-	     ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c \
-	     ev.3 ev.pod
-
-man_MANS = ev.3
-
-include_HEADERS = ev.h ev++.h event.h
-
-lib_LTLIBRARIES = libev.la
-
-libev_la_SOURCES = ev.c event.c
-libev_la_LDFLAGS = -version-info $(VERSION_INFO)
-
--- a/deps/libev/Makefile.in
+++ b/deps/libev/Makefile.in
@@ -1,685 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure config.guess \
-	config.sub install-sh ltmain.sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/libev.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \
-	"$(DESTDIR)$(includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libev_la_LIBADD =
-am_libev_la_OBJECTS = ev.lo event.lo
-libev_la_OBJECTS = $(am_libev_la_OBJECTS)
-libev_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libev_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libev_la_SOURCES)
-DIST_SOURCES = $(libev_la_SOURCES)
-man3dir = $(mandir)/man3
-NROFF = nroff
-MANS = $(man_MANS)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NMEDIT = @NMEDIT@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign no-dependencies
-VERSION_INFO = 3:0
-EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \
-	     ev_vars.h ev_wrap.h \
-	     ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c \
-	     ev.3 ev.pod
-
-man_MANS = ev.3
-include_HEADERS = ev.h ev++.h event.h
-lib_LTLIBRARIES = libev.la
-libev_la_SOURCES = ev.c event.c
-libev_la_LDFLAGS = -version-info $(VERSION_INFO)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libev.la: $(libev_la_OBJECTS) $(libev_la_DEPENDENCIES) 
-	$(libev_la_LINK) -rpath $(libdir) $(libev_la_OBJECTS) $(libev_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-install-man3: $(man3_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
-	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    3*) ;; \
-	    *) ext='3' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-	done
-uninstall-man3:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    3*) ;; \
-	    *) ext='3' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
-	done
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(MANS) $(HEADERS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS install-man
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man: install-man3
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
-	uninstall-man
-
-uninstall-man: uninstall-man3
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
-	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
-	dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-man3 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-man uninstall-man3
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
--- a/deps/libev/aclocal.m4
+++ b/deps/libev/aclocal.m4
--- a/deps/libev/autogen.sh
+++ b/deps/libev/autogen.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-libtoolize --force
-automake --add-missing
-autoreconf
-
--- a/deps/libev/config.h.in
+++ b/deps/libev/config.h.in
@@ -1,121 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#undef HAVE_CLOCK_GETTIME
-
-/* "use syscall interface for clock_gettime" */
-#undef HAVE_CLOCK_SYSCALL
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-#undef HAVE_EPOLL_CTL
-
-/* Define to 1 if you have the `eventfd' function. */
-#undef HAVE_EVENTFD
-
-/* Define to 1 if you have the `inotify_init' function. */
-#undef HAVE_INOTIFY_INIT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `kqueue' function. */
-#undef HAVE_KQUEUE
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-#undef HAVE_LIBRT
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `nanosleep' function. */
-#undef HAVE_NANOSLEEP
-
-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
-
-/* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define to 1 if you have the `port_create' function. */
-#undef HAVE_PORT_CREATE
-
-/* Define to 1 if you have the <port.h> header file. */
-#undef HAVE_PORT_H
-
-/* Define to 1 if you have the `select' function. */
-#undef HAVE_SELECT
-
-/* Define to 1 if you have the `signalfd' function. */
-#undef HAVE_SIGNALFD
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#undef HAVE_SYS_EPOLL_H
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-#undef HAVE_SYS_EVENTFD_H
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-#undef HAVE_SYS_EVENT_H
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-#undef HAVE_SYS_INOTIFY_H
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-#undef HAVE_SYS_QUEUE_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/signalfd.h> header file. */
-#undef HAVE_SYS_SIGNALFD_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
--- a/deps/libev/configure
+++ b/deps/libev/configure
--- a/deps/libev/configure.ac
+++ b/deps/libev/configure.ac
@@ -1,18 +0,0 @@
-AC_INIT
-AC_CONFIG_SRCDIR([ev_epoll.c])
-
-AM_INIT_AUTOMAKE(libev,3.8) dnl also update ev.h!
-AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
-
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-
-if test "x$GCC" = xyes ; then
-  CFLAGS="$CFLAGS -O3"
-fi
-
-m4_include([libev.m4])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
--- a/deps/libev/ev.h
+++ b/deps/libev/ev.h
@@ -1,703 +0,0 @@
-/*
- * libev native API header
- *
- * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
- * CIAL, 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 OTH-
- * ERWISE) 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 file 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 file
- * 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. If you do not delete the
- * provisions above, a recipient may use your version of this file under
- * either the BSD or the GPL.
- */
-
-#ifndef EV_H_
-#define EV_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef double ev_tstamp;
-
-/* these priorities are inclusive, higher priorities will be called earlier */
-#ifndef EV_MINPRI
-# define EV_MINPRI -2
-#endif
-#ifndef EV_MAXPRI
-# define EV_MAXPRI +2
-#endif
-
-#ifndef EV_MULTIPLICITY
-# define EV_MULTIPLICITY 1
-#endif
-
-#ifndef EV_PERIODIC_ENABLE
-# define EV_PERIODIC_ENABLE 1
-#endif
-
-#ifndef EV_STAT_ENABLE
-# define EV_STAT_ENABLE 1
-#endif
-
-#ifndef EV_IDLE_ENABLE
-# define EV_IDLE_ENABLE 1
-#endif
-
-#ifndef EV_FORK_ENABLE
-# define EV_FORK_ENABLE 1
-#endif
-
-#ifndef EV_EMBED_ENABLE
-# define EV_EMBED_ENABLE 1
-#endif
-
-#ifndef EV_ASYNC_ENABLE
-# define EV_ASYNC_ENABLE 1
-#endif
-
-#ifndef EV_WALK_ENABLE
-# define EV_WALK_ENABLE 0 /* not yet */
-#endif
-
-#ifndef EV_ATOMIC_T
-# include <signal.h>
-# define EV_ATOMIC_T sig_atomic_t volatile
-#endif
-
-/*****************************************************************************/
-
-#if EV_STAT_ENABLE
-# ifdef _WIN32
-#  include <time.h>
-#  include <sys/types.h>
-# endif
-# include <sys/stat.h>
-#endif
-
-/* support multiple event loops? */
-#if EV_MULTIPLICITY
-struct ev_loop;
-# define EV_P struct ev_loop *loop
-# define EV_P_ EV_P,
-# define EV_A loop
-# define EV_A_ EV_A,
-# define EV_DEFAULT_UC ev_default_loop_uc ()
-# define EV_DEFAULT_UC_ EV_DEFAULT_UC,
-# define EV_DEFAULT ev_default_loop (0)
-# define EV_DEFAULT_ EV_DEFAULT,
-#else
-# define EV_P void
-# define EV_P_
-# define EV_A
-# define EV_A_
-# define EV_DEFAULT
-# define EV_DEFAULT_
-# define EV_DEFAULT_UC
-# define EV_DEFAULT_UC_
-# undef EV_EMBED_ENABLE
-#endif
-
-#if __STDC_VERSION__ >= 199901L || __GNUC__ >= 3
-# define EV_INLINE static inline
-#else
-# define EV_INLINE static
-#endif
-
-/*****************************************************************************/
-
-/* eventmask, revents, events... */
-#define EV_UNDEF            -1 /* guaranteed to be invalid */
-#define EV_NONE           0x00 /* no events */
-#define EV_READ           0x01 /* ev_io detected read will not block */
-#define EV_WRITE          0x02 /* ev_io detected write will not block */
-#define EV__IOFDSET       0x80 /* internal use only */
-#define EV_IO          EV_READ /* alias for type-detection */
-#define EV_TIMEOUT  0x00000100 /* timer timed out */
-#define EV_TIMER    EV_TIMEOUT /* alias for type-detection */
-#define EV_PERIODIC 0x00000200 /* periodic timer timed out */
-#define EV_SIGNAL   0x00000400 /* signal was received */
-#define EV_CHILD    0x00000800 /* child/pid had status change */
-#define EV_STAT     0x00001000 /* stat data changed */
-#define EV_IDLE     0x00002000 /* event loop is idling */
-#define EV_PREPARE  0x00004000 /* event loop about to poll */
-#define EV_CHECK    0x00008000 /* event loop finished poll */
-#define EV_EMBED    0x00010000 /* embedded event loop needs sweep */
-#define EV_FORK     0x00020000 /* event loop resumed in child */
-#define EV_ASYNC    0x00040000 /* async intra-loop signal */
-#define EV_CUSTOM   0x01000000 /* for use by user code */
-#define EV_ERROR    0x80000000 /* sent when an error occurs */
-
-/* can be used to add custom fields to all watchers, while losing binary compatibility */
-#ifndef EV_COMMON
-# define EV_COMMON void *data;
-#endif
-#ifndef EV_PROTOTYPES
-# define EV_PROTOTYPES 1
-#endif
-
-#define EV_VERSION_MAJOR 3
-#define EV_VERSION_MINOR 8
-
-#ifndef EV_CB_DECLARE
-# define EV_CB_DECLARE(type) void (*cb)(EV_P_ struct type *w, int revents);
-#endif
-#ifndef EV_CB_INVOKE
-# define EV_CB_INVOKE(watcher,revents) (watcher)->cb (EV_A_ (watcher), (revents))
-#endif
-
-/*
- * struct member types:
- * private: you may look at them, but not change them,
- *          and they might not mean anything to you.
- * ro: can be read anytime, but only changed when the watcher isn't active.
- * rw: can be read and modified anytime, even when the watcher is active.
- *
- * some internal details that might be helpful for debugging:
- *
- * active is either 0, which means the watcher is not active,
- *           or the array index of the watcher (periodics, timers)
- *           or the array index + 1 (most other watchers)
- *           or simply 1 for watchers that aren't in some array.
- * pending is either 0, in which case the watcher isn't,
- *           or the array index + 1 in the pendings array.
- */
-
-#if EV_MINPRI == EV_MAXPRI
-# define EV_DECL_PRIORITY
-#else
-# define EV_DECL_PRIORITY int priority;
-#endif
-
-/* shared by all watchers */
-#define EV_WATCHER(type)			\
-  int active; /* private */			\
-  int pending; /* private */			\
-  EV_DECL_PRIORITY /* private */		\
-  EV_COMMON /* rw */				\
-  EV_CB_DECLARE (type) /* private */
-
-#define EV_WATCHER_LIST(type)			\
-  EV_WATCHER (type)				\
-  struct ev_watcher_list *next; /* private */
-
-#define EV_WATCHER_TIME(type)			\
-  EV_WATCHER (type)				\
-  ev_tstamp at;     /* private */
-
-/* base class, nothing to see here unless you subclass */
-typedef struct ev_watcher
-{
-  EV_WATCHER (ev_watcher)
-} ev_watcher;
-
-/* base class, nothing to see here unless you subclass */
-typedef struct ev_watcher_list
-{
-  EV_WATCHER_LIST (ev_watcher_list)
-} ev_watcher_list;
-
-/* base class, nothing to see here unless you subclass */
-typedef struct ev_watcher_time
-{
-  EV_WATCHER_TIME (ev_watcher_time)
-} ev_watcher_time;
-
-/* invoked when fd is either EV_READable or EV_WRITEable */
-/* revent EV_READ, EV_WRITE */
-typedef struct ev_io
-{
-  EV_WATCHER_LIST (ev_io)
-
-  int fd;     /* ro */
-  int events; /* ro */
-} ev_io;
-
-/* invoked after a specific time, repeatable (based on monotonic clock) */
-/* revent EV_TIMEOUT */
-typedef struct ev_timer
-{
-  EV_WATCHER_TIME (ev_timer)
-
-  ev_tstamp repeat; /* rw */
-} ev_timer;
-
-/* invoked at some specific time, possibly repeating at regular intervals (based on UTC) */
-/* revent EV_PERIODIC */
-typedef struct ev_periodic
-{
-  EV_WATCHER_TIME (ev_periodic)
-
-  ev_tstamp offset; /* rw */
-  ev_tstamp interval; /* rw */
-  ev_tstamp (*reschedule_cb)(struct ev_periodic *w, ev_tstamp now); /* rw */
-} ev_periodic;
-
-/* invoked when the given signal has been received */
-/* revent EV_SIGNAL */
-typedef struct ev_signal
-{
-  EV_WATCHER_LIST (ev_signal)
-
-  int signum; /* ro */
-} ev_signal;
-
-/* invoked when sigchld is received and waitpid indicates the given pid */
-/* revent EV_CHILD */
-/* does not support priorities */
-typedef struct ev_child
-{
-  EV_WATCHER_LIST (ev_child)
-
-  int flags;   /* private */
-  int pid;     /* ro */
-  int rpid;    /* rw, holds the received pid */
-  int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */
-} ev_child;
-
-#if EV_STAT_ENABLE
-/* st_nlink = 0 means missing file or other error */
-# ifdef _WIN32
-typedef struct _stati64 ev_statdata;
-# else
-typedef struct stat ev_statdata;
-# endif
-
-/* invoked each time the stat data changes for a given path */
-/* revent EV_STAT */
-typedef struct ev_stat
-{
-  EV_WATCHER_LIST (ev_stat)
-
-  ev_timer timer;     /* private */
-  ev_tstamp interval; /* ro */
-  const char *path;   /* ro */
-  ev_statdata prev;   /* ro */
-  ev_statdata attr;   /* ro */
-
-  int wd; /* wd for inotify, fd for kqueue */
-} ev_stat;
-#endif
-
-#if EV_IDLE_ENABLE
-/* invoked when the nothing else needs to be done, keeps the process from blocking */
-/* revent EV_IDLE */
-typedef struct ev_idle
-{
-  EV_WATCHER (ev_idle)
-} ev_idle;
-#endif
-
-/* invoked for each run of the mainloop, just before the blocking call */
-/* you can still change events in any way you like */
-/* revent EV_PREPARE */
-typedef struct ev_prepare
-{
-  EV_WATCHER (ev_prepare)
-} ev_prepare;
-
-/* invoked for each run of the mainloop, just after the blocking call */
-/* revent EV_CHECK */
-typedef struct ev_check
-{
-  EV_WATCHER (ev_check)
-} ev_check;
-
-#if EV_FORK_ENABLE
-/* the callback gets invoked before check in the child process when a fork was detected */
-typedef struct ev_fork
-{
-  EV_WATCHER (ev_fork)
-} ev_fork;
-#endif
-
-#if EV_EMBED_ENABLE
-/* used to embed an event loop inside another */
-/* the callback gets invoked when the event loop has handled events, and can be 0 */
-typedef struct ev_embed
-{
-  EV_WATCHER (ev_embed)
-
-  struct ev_loop *other; /* ro */
-  ev_io io;              /* private */
-  ev_prepare prepare;    /* private */
-  ev_check check;        /* unused */
-  ev_timer timer;        /* unused */
-  ev_periodic periodic;  /* unused */
-  ev_idle idle;          /* unused */
-  ev_fork fork;          /* private */
-} ev_embed;
-#endif
-
-#if EV_ASYNC_ENABLE
-/* invoked when somebody calls ev_async_send on the watcher */
-/* revent EV_ASYNC */
-typedef struct ev_async
-{
-  EV_WATCHER (ev_async)
-
-  EV_ATOMIC_T sent; /* private */
-} ev_async;
-
-# define ev_async_pending(w) ((w)->sent + 0)
-#endif
-
-/* the presence of this union forces similar struct layout */
-union ev_any_watcher
-{
-  struct ev_watcher w;
-  struct ev_watcher_list wl;
-
-  struct ev_io io;
-  struct ev_timer timer;
-  struct ev_periodic periodic;
-  struct ev_signal signal;
-  struct ev_child child;
-#if EV_STAT_ENABLE
-  struct ev_stat stat;
-#endif
-#if EV_IDLE_ENABLE
-  struct ev_idle idle;
-#endif
-  struct ev_prepare prepare;
-  struct ev_check check;
-#if EV_FORK_ENABLE
-  struct ev_fork fork;
-#endif
-#if EV_EMBED_ENABLE
-  struct ev_embed embed;
-#endif
-#if EV_ASYNC_ENABLE
-  struct ev_async async;
-#endif
-};
-
-/* bits for ev_default_loop and ev_loop_new */
-/* the default */
-#define EVFLAG_AUTO       0x00000000U /* not quite a mask */
-/* flag bits */
-#define EVFLAG_NOENV      0x01000000U /* do NOT consult environment */
-#define EVFLAG_FORKCHECK  0x02000000U /* check for a fork in each iteration */
-/* debugging/feature disable */
-#define EVFLAG_NOINOTIFY  0x00100000U /* do not attempt to use inotify */
-#define EVFLAG_NOSIGFD    0x00200000U /* do not attempt to use signalfd */
-/* method bits to be ored together */
-#define EVBACKEND_SELECT  0x00000001U /* about anywhere */
-#define EVBACKEND_POLL    0x00000002U /* !win */
-#define EVBACKEND_EPOLL   0x00000004U /* linux */
-#define EVBACKEND_KQUEUE  0x00000008U /* bsd */
-#define EVBACKEND_DEVPOLL 0x00000010U /* solaris 8 */ /* NYI */
-#define EVBACKEND_PORT    0x00000020U /* solaris 10 */
-
-#if EV_PROTOTYPES
-int ev_version_major (void);
-int ev_version_minor (void);
-
-unsigned int ev_supported_backends (void);
-unsigned int ev_recommended_backends (void);
-unsigned int ev_embeddable_backends (void);
-
-ev_tstamp ev_time (void);
-void ev_sleep (ev_tstamp delay); /* sleep for a while */
-
-/* Sets the allocation function to use, works like realloc.
- * It is used to allocate and free memory.
- * If it returns zero when memory needs to be allocated, the library might abort
- * or take some potentially destructive action.
- * The default is your system realloc function.
- */
-void ev_set_allocator (void *(*cb)(void *ptr, long size));
-
-/* set the callback function to call on a
- * retryable syscall error
- * (such as failed select, poll, epoll_wait)
- */
-void ev_set_syserr_cb (void (*cb)(const char *msg));
-
-#if EV_MULTIPLICITY
-EV_INLINE struct ev_loop *
-ev_default_loop_uc (void)
-{
-  extern struct ev_loop *ev_default_loop_ptr;
-
-  return ev_default_loop_ptr;
-}
-
-/* the default loop is the only one that handles signals and child watchers */
-/* you can call this as often as you like */
-EV_INLINE struct ev_loop *
-ev_default_loop (unsigned int flags)
-{
-  struct ev_loop *loop = ev_default_loop_uc ();
-
-  if (!loop)
-    {
-      extern struct ev_loop *ev_default_loop_init (unsigned int flags);
-
-      loop = ev_default_loop_init (flags);
-    }
-
-  return loop;
-}
-
-/* create and destroy alternative loops that don't handle signals */
-struct ev_loop *ev_loop_new (unsigned int flags);
-void ev_loop_destroy (EV_P);
-void ev_loop_fork (EV_P);
-
-ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after each poll */
-
-#else
-
-int ev_default_loop (unsigned int flags); /* returns true when successful */
-
-EV_INLINE ev_tstamp
-ev_now (void)
-{
-  extern ev_tstamp ev_rt_now;
-
-  return ev_rt_now;
-}
-#endif /* multiplicity */
-
-EV_INLINE int
-ev_is_default_loop (EV_P)
-{
-#if EV_MULTIPLICITY
-  extern struct ev_loop *ev_default_loop_ptr;
-
-  return !!(EV_A == ev_default_loop_ptr);
-#else
-  return 1;
-#endif
-}
-
-void ev_default_destroy (void); /* destroy the default loop */
-/* this needs to be called after fork, to duplicate the default loop */
-/* if you create alternative loops you have to call ev_loop_fork on them */
-/* you can call it in either the parent or the child */
-/* you can actually call it at any time, anywhere :) */
-void ev_default_fork (void);
-
-unsigned int ev_backend (EV_P); /* backend in use by loop */
-
-void ev_now_update (EV_P); /* update event loop time */
-
-#if EV_WALK_ENABLE
-/* walk (almost) all watchers in the loop of a given type, invoking the */
-/* callback on every such watcher. The callback might stop the watcher, */
-/* but do nothing else with the loop */
-void ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w));
-#endif
-
-#endif /* prototypes */
-
-#define EVLOOP_NONBLOCK	1 /* do not block/wait */
-#define EVLOOP_ONESHOT	2 /* block *once* only */
-#define EVUNLOOP_CANCEL 0 /* undo unloop */
-#define EVUNLOOP_ONE    1 /* unloop once */
-#define EVUNLOOP_ALL    2 /* unloop all loops */
-
-#if EV_PROTOTYPES
-void ev_loop (EV_P_ int flags);
-void ev_unloop (EV_P_ int how); /* set to 1 to break out of event loop, set to 2 to break out of all event loops */
-
-/*
- * ref/unref can be used to add or remove a refcount on the mainloop. every watcher
- * keeps one reference. if you have a long-running watcher you never unregister that
- * should not keep ev_loop from running, unref() after starting, and ref() before stopping.
- */
-void ev_ref   (EV_P);
-void ev_unref (EV_P);
-
-/*
- * convenience function, wait for a single event, without registering an event watcher
- * if timeout is < 0, do wait indefinitely
- */
-void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg);
-
-# if EV_MINIMAL < 2
-unsigned int ev_loop_count  (EV_P); /* number of loop iterations */
-unsigned int ev_loop_depth  (EV_P); /* #ev_loop enters - #ev_loop leaves */
-void         ev_loop_verify (EV_P); /* abort if loop data corrupted */
-
-void ev_set_io_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */
-void ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */
-
-/* advanced stuff for threading etc. support, see docs */
-void ev_set_userdata (EV_P_ void *data);
-void *ev_userdata (EV_P);
-void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P));
-void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P));
-
-unsigned int ev_pending_count (EV_P); /* number of pending events, if any */
-void ev_invoke_pending (EV_P); /* invoke all pending watchers */
-
-/*
- * stop/start the timer handling.
- */
-void ev_suspend (EV_P);
-void ev_resume  (EV_P);
-#endif
-
-#endif
-
-/* these may evaluate ev multiple times, and the other arguments at most once */
-/* either use ev_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
-#define ev_init(ev,cb_) do {			\
-  ((ev_watcher *)(void *)(ev))->active  =	\
-  ((ev_watcher *)(void *)(ev))->pending = 0;	\
-  ev_set_priority ((ev), 0);			\
-  ev_set_cb ((ev), cb_);			\
-} while (0)
-
-#define ev_io_set(ev,fd_,events_)            do { (ev)->fd = (fd_); (ev)->events = (events_) | EV__IOFDSET; } while (0)
-#define ev_timer_set(ev,after_,repeat_)      do { ((ev_watcher_time *)(ev))->at = (after_); (ev)->repeat = (repeat_); } while (0)
-#define ev_periodic_set(ev,ofs_,ival_,rcb_)  do { (ev)->offset = (ofs_); (ev)->interval = (ival_); (ev)->reschedule_cb = (rcb_); } while (0)
-#define ev_signal_set(ev,signum_)            do { (ev)->signum = (signum_); } while (0)
-#define ev_child_set(ev,pid_,trace_)         do { (ev)->pid = (pid_); (ev)->flags = !!(trace_); } while (0)
-#define ev_stat_set(ev,path_,interval_)      do { (ev)->path = (path_); (ev)->interval = (interval_); (ev)->wd = -2; } while (0)
-#define ev_idle_set(ev)                      /* nop, yes, this is a serious in-joke */
-#define ev_prepare_set(ev)                   /* nop, yes, this is a serious in-joke */
-#define ev_check_set(ev)                     /* nop, yes, this is a serious in-joke */
-#define ev_embed_set(ev,other_)              do { (ev)->other = (other_); } while (0)
-#define ev_fork_set(ev)                      /* nop, yes, this is a serious in-joke */
-#define ev_async_set(ev)                     do { (ev)->sent = 0; } while (0)
-
-#define ev_io_init(ev,cb,fd,events)          do { ev_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0)
-#define ev_timer_init(ev,cb,after,repeat)    do { ev_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0)
-#define ev_periodic_init(ev,cb,ofs,ival,rcb) do { ev_init ((ev), (cb)); ev_periodic_set ((ev),(ofs),(ival),(rcb)); } while (0)
-#define ev_signal_init(ev,cb,signum)         do { ev_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0)
-#define ev_child_init(ev,cb,pid,trace)       do { ev_init ((ev), (cb)); ev_child_set ((ev),(pid),(trace)); } while (0)
-#define ev_stat_init(ev,cb,path,interval)    do { ev_init ((ev), (cb)); ev_stat_set ((ev),(path),(interval)); } while (0)
-#define ev_idle_init(ev,cb)                  do { ev_init ((ev), (cb)); ev_idle_set ((ev)); } while (0)
-#define ev_prepare_init(ev,cb)               do { ev_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0)
-#define ev_check_init(ev,cb)                 do { ev_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
-#define ev_embed_init(ev,cb,other)           do { ev_init ((ev), (cb)); ev_embed_set ((ev),(other)); } while (0)
-#define ev_fork_init(ev,cb)                  do { ev_init ((ev), (cb)); ev_fork_set ((ev)); } while (0)
-#define ev_async_init(ev,cb)                 do { ev_init ((ev), (cb)); ev_async_set ((ev)); } while (0)
-
-#define ev_is_pending(ev)                    (0 + ((ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
-#define ev_is_active(ev)                     (0 + ((ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */
-
-#define ev_cb(ev)                            (ev)->cb /* rw */
-
-#if EV_MINPRI == EV_MAXPRI
-# define ev_priority(ev)                     ((ev), EV_MINPRI)
-# define ev_set_priority(ev,pri)             ((ev), (pri))
-#else
-# define ev_priority(ev)                     ((((ev_watcher *)(void *)(ev))->priority) + 0)
-# define ev_set_priority(ev,pri)             (  (ev_watcher *)(void *)(ev))->priority = (pri)
-#endif
-
-#define ev_periodic_at(ev)                   (((ev_watcher_time *)(ev))->at + 0.)
-
-#ifndef ev_set_cb
-# define ev_set_cb(ev,cb_)                   ev_cb (ev) = (cb_)
-#endif
-
-/* stopping (enabling, adding) a watcher does nothing if it is already running */
-/* stopping (disabling, deleting) a watcher does nothing unless its already running */
-#if EV_PROTOTYPES
-
-/* feeds an event into a watcher as if the event actually occured */
-/* accepts any ev_watcher type */
-void ev_feed_event     (EV_P_ void *w, int revents);
-void ev_feed_fd_event  (EV_P_ int fd, int revents);
-void ev_feed_signal_event (EV_P_ int signum);
-void ev_invoke         (EV_P_ void *w, int revents);
-int  ev_clear_pending  (EV_P_ void *w);
-
-void ev_io_start       (EV_P_ ev_io *w);
-void ev_io_stop        (EV_P_ ev_io *w);
-
-void ev_timer_start    (EV_P_ ev_timer *w);
-void ev_timer_stop     (EV_P_ ev_timer *w);
-/* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
-void ev_timer_again    (EV_P_ ev_timer *w);
-/* return remaining time */
-ev_tstamp ev_timer_remaining (EV_P_ ev_timer *w);
-
-#if EV_PERIODIC_ENABLE
-void ev_periodic_start (EV_P_ ev_periodic *w);
-void ev_periodic_stop  (EV_P_ ev_periodic *w);
-void ev_periodic_again (EV_P_ ev_periodic *w);
-#endif
-
-/* only supported in the default loop */
-void ev_signal_start   (EV_P_ ev_signal *w);
-void ev_signal_stop    (EV_P_ ev_signal *w);
-
-/* only supported in the default loop */
-void ev_child_start    (EV_P_ ev_child *w);
-void ev_child_stop     (EV_P_ ev_child *w);
-
-# if EV_STAT_ENABLE
-void ev_stat_start     (EV_P_ ev_stat *w);
-void ev_stat_stop      (EV_P_ ev_stat *w);
-void ev_stat_stat      (EV_P_ ev_stat *w);
-# endif
-
-# if EV_IDLE_ENABLE
-void ev_idle_start     (EV_P_ ev_idle *w);
-void ev_idle_stop      (EV_P_ ev_idle *w);
-# endif
-
-void ev_prepare_start  (EV_P_ ev_prepare *w);
-void ev_prepare_stop   (EV_P_ ev_prepare *w);
-
-void ev_check_start    (EV_P_ ev_check *w);
-void ev_check_stop     (EV_P_ ev_check *w);
-
-# if EV_FORK_ENABLE
-void ev_fork_start     (EV_P_ ev_fork *w);
-void ev_fork_stop      (EV_P_ ev_fork *w);
-# endif
-
-# if EV_EMBED_ENABLE
-/* only supported when loop to be embedded is in fact embeddable */
-void ev_embed_start    (EV_P_ ev_embed *w);
-void ev_embed_stop     (EV_P_ ev_embed *w);
-void ev_embed_sweep    (EV_P_ ev_embed *w);
-# endif
-
-# if EV_ASYNC_ENABLE
-void ev_async_start    (EV_P_ ev_async *w);
-void ev_async_stop     (EV_P_ ev_async *w);
-void ev_async_send     (EV_P_ ev_async *w);
-# endif
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
--- a/Show More
+++ b/Show More