Bump version to v0.6.2

zlib: Fix invalidly failing test
build: compile with -D__DARWIN_64_BIT_INO_T on OS X
2026-04-28 03:01:10 -04:00 · 2011-11-18 23:43:03 +01:00 · 2011-11-18 14:38:44 -08:00 · 2011-11-18 21:17:13 +01:00 · 2011-11-18 21:17:09 +01:00 · 2011-11-18 14:18:42 +01:00
3788 changed files with 848986 additions and 160422 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+test/fixtures/* -text
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,36 @@
-build
+
 .waf*
 tags
 .lock-wscript
 *.pyc
 doc/api.xml
-tools/nodejs.pc
-test/fixtures/hello.txt
 tmp/
 node
 node_g
 *.swp
 .benchmark_reports
 /.project
-/.cproject
+/.cproject
+
+/out
+
+# various stuff that VC++ produces/uses
+Debug/
+Release/
+*.sln
+!nodemsi.sln
+*.suo
+*.vcproj
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
+UpgradeLog*.XML
+_UpgradeReport_Files/
+ipch/
+*.sdf
+*.opensdf
+
+/options.gypi
+*-nodegyp*
+/gyp-mac-tool
+/dist-osx
--- a/84
+++ b/84
@@ -152,4 +152,86 @@ Theo Schlossnagle <jesus@omniti.com>
 Kai Chen <kaichenxyz@gmail.com>
 Daniel C <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>
+Daniel Gröber <dxld@darkboxed.org>
+Konstantin Käfer <github@kkaefer.com>
+Richard Rodger <richard@ricebridge.com>
+Andreas Reich <andreas@reich.name>
+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>
+Scott McWhirter <scott.mcwhirter@joyent.com>
+Jakub Lekstan <jakub.lekstan@dreamlab.pl>
+Tim Baumann <tim@timbaumann.info>
+Robert Mustacchi <rm@joyent.com>
+George Miroshnykov <george.miroshnykov@gmail.com>
+Marcel Laverdet <marcel@laverdet.com>
+Alexandre Marangone <a.marangone@gmail.com>
+Mark Cavage <mark.cavage@joyent.com>
+Ryan Petrello <lists@ryanpetrello.com>
+Siddharth Mahendraker <siddharth_mahen@hotmail.com>
+Mathias Buus <m@ge.tt>
+Yoshihiro KIKUCHI <yknetg@gmail.com>
+Brett Kiefer <kiefer@gmail.com>
+Mariano Iglesias <mariano@cricava.com>
+Jörn Horstmann <git@jhorstmann.net>
+Joe Shaw <joeshaw@litl.com>
+Alex Xu <alex_y_xu@yahoo.ca>
+Kip Gebhardt <kip.gebhardt@voxer.com>
+Stefan Rusu <saltwaterc@gmail.com>
+Wojciech Wnętrzak <w.wnetrzak@gmail.com>
+Reid Burke <me@reidburke.com>
+Niklas Fiekas <niklas.fiekas@googlemail.com>
+Adam Luikart <me@adamluikart.com>
+avz <a.arepo@gmail.com>
+Jeremy Selier <jeremy@jolicloud.com>
+Igor Zinkovsky <igorzi@microsoft.com>
+Shigeki Ohtsu <ohtsu@d.jp>
+vegorov@chromium.org <vegorov@chromium.org>
+Pierre-Alexandre St-Jean <pierrealexandre.stjean@gmail.com>
+Vicente Jimenez Aguilar <googuy@gmail.com>
+SAWADA Tadashi <cesare@mayverse.jp>
+Logan Smyth <loganfsmyth@gmail.com>
+Christopher Wright <christopherwright@gmail.com>
+Mickaël Delahaye <mickael.delahaye@gmail.com>
+Aku Kotkavuo <aku@hibana.net>
+Peter Bright <drpizza@quiscalusmexicanus.org>
+Glen Low <glen.low@pixelglow.com>
+Thomas Shinnick <tshinnic@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>
+jkummerow@chromium.org <jkummerow@chromium.org>
+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>
+Ben Leslie <benno@benno.id.au>
+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>
+Zachary Scott <zachary@zacharyscott.net>
+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>
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+all:
+	@echo "I need GNU make. Please run \`gmake\` instead."
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,94 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(node)
-
-if(USE_GCOV)
-  set(CMAKE_BUILD_TYPE "Debug")
-
-  # Set global c and c++ flags
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-
-  # Link flags used for creating executables
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov -fprofile-arcs")
-
-  # Link flags used for creating shared libraries
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lgcov -profile-arcs")
-endif()
-
-#
-# options
-#
-
-find_package(PythonInterp 2 REQUIRED)
-
-option(SHARED_V8 "use system shared V8 library")
-option(SHARED_LIBEV "use system shared libev library")
-option(SHARED_CARES "use system shared c-ares library")
-option(V8_SNAPSHOT "turn on snapshot when building stock v8")
-
-
-# cmake policies to get rid of some warnings
-cmake_policy(SET CMP0009 NEW) # GLOB_RECURSE should no follow symlinks
-
-# generic cmake configuration
-include("cmake/configure.cmake")
-
-# find and configure libs
-include("cmake/libs.cmake")
-
-# setup node build targets
-include("cmake/node_build.cmake")
-
-# setup v8 build targets
-include("cmake/v8_build.cmake")
-
-# docs
-## might want to move this to doc/CMakeLists.txt
-include("cmake/docs.cmake")
-
-# tests
-enable_testing()
-include(CTest)
-add_subdirectory("test/")
-
-# package
-include("cmake/package.cmake")
-
-
-#
-# Final build configuration output
-#
-
-message("** Build Summary **")
-message("  Version:            ${node_version_string}")
-message("  Prefix:             ${PREFIX}")
-message("  Build Type:         ${CMAKE_BUILD_TYPE}")
-message("  Architecture:       ${CMAKE_SYSTEM_PROCESSOR}")
-
-if(SHARED_V8)
-message("  V8:                 ${V8_LIBRARY_PATH}")
-#else()
-#message(" V8 jobs:            ${parallel_jobs}")
-endif()
-
-if(SHARED_libev)
-  message("  libev:              ${LIBEV_LIBRARY}")
-endif()
-
-if(SHARED_CARES)
-  message("  libc-ares:          ${LIBCARES_LIBRARY}")
-endif()
-
-message("  RT library:         ${RT}")
-message("  DL library:         ${DL}")
-
-if(${OPENSSL_FOUND} MATCHES TRUE)
-  message("  OpenSSL:            ${OPENSSL_LIBRARIES}")
-endif()
-
-if(USE_GCOV)
-  message("  gcov:               enabled")
-endif()
-
-message("  CCFLAGS:            ${CCFLAGS}")
-message("  CPPFLAGS:           ${CPPFLAGS}")
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -1,7 +0,0 @@
-set(CTEST_PROJECT_NAME "node")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=node")
-set(CTEST_DROP_SITE_CDASH TRUE)
--- a/977
+++ b/977
--- a/107
+++ b/107
@@ -1,49 +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 a BSD 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.
-
-  - 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.
-
-  - C-Ares, an asynchronous DNS client, located at deps/c-ares. Copyright by
-    the Massachusetts Institute of Technology; authored by Greg Hudson,
-    Daniel Stenberg and others. Released under an MIT license.
-
-  - Node, optionally, dynmaically links to OpenSSL, cryptographic software
-    written by Eric Young (eay@cryptsoft.com) to provide SSL/TLS encryption.
-    OpenSSL is copyrighted by The OpenSSL Project.  OpenSSL has a simple
-    Apache-style license. OpenSSL is not included in the Node distribution.
-    See http://openssl.org/ for more information.
-
-  - tools/doctool/markdown.js is Released under MIT license and
-    Copyright 2009-2010 Dominic Baggott and Ash Berli
-
-  - HTTP Parser, located at deps/http_parser, is a small C library
-    copyrighted by Ryan Lienhart Dahl and has a MIT license.
-
-  - src/platform_darwin_proctitle.cc, has code taken from the Chromium
-    project copyright Google Inc. and released with the BSD license.
-
-  - tools/closure_linter is copyrighted by The Closure Linter Authors and
-    Google Inc and is released under the Apache license.
-
-  - tools/cpplint.py is copyrighted by Google Inc and is released under the
-    BSD license.
-
-
 Node's license follows:

-Copyright 2009, 2010 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
@@ -60,4 +19,62 @@ 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 is copyright Google, Inc, and released
+    under a BSD license.
+
+  - libev, located at deps/libev, and libeio, located at deps/libeio. libev
+    and libeio are copyright Marc Alexander Lehmann, and dual-licensed
+    under the MIT license and GPL2.
+
+  - WAF build system, located at tools/waf. WAF is copyright Thomas Nagy,
+    and released under the MIT license.
+
+  - The SCONS build system, located at tools/scons. SCONS is copyright
+    the SCONS Foundation and released under the MIT license.
+
+  - C-Ares, an asynchronous DNS client, located at deps/c-ares. C-Ares is
+    copyright the Massachusetts Institute of Technology, authored by
+    Greg Hudson, Daniel Stenberg and others, and released under the MIT
+    license.
+
+  - Node, optionally, links to OpenSSL, it is located at deps/openssl.
+    OpenSSL is cryptographic software written by Eric Young
+    (eay@cryptsoft.com) to provide SSL/TLS encryption. OpenSSL is copyright
+    The OpenSSL Project and released under the OpenSSL license.
+
+  - tools/doctool/markdown.js is copyright 2009-2010 Dominic Baggott and Ash
+    Berli and released under the MIT license.
+
+  - HTTP Parser, located at deps/http_parser, is a small C library
+    copyright Ryan Lienhart Dahl and released under the MIT license.
+
+  - src/platform_darwin_proctitle.cc, has code taken from the Chromium
+    project copyright Google Inc. and released under a BSD license.
+
+  - tools/closure_linter is copyright The Closure Linter Authors and
+    Google Inc. and released under the Apache License, version 2.0.
+
+  - tools/cpplint.py is copyright Google Inc. and released under a
+    BSD license.
+
+  - lib/buffer_ieee754.js is copyright 2008 Fair Oaks Labs, Inc. and released
+    under the New BSD license.
+
+  - lib/punycode.js is copyright 2011 Mathias Bynens <http://mathiasbynens.be/>
+    and released under the MIT license.
+
+  - tools/gyp GYP is a meta-build system copyright 2009 Google Inc and
+    licensed under the three clause BSD license. See tools/gyp/LICENSE.
+
+  - deps/zlib copyright 1995-2010 Jean-loup Gailly and Mark Adler
+    licensed under a permissive free software license. See
+    deps/zlib/LICENSE.
--- a/99
+++ b/99
@@ -1,8 +1,17 @@
 WAF=python tools/waf-light

-web_root = ryan@nodejs.org:~/web/nodejs.org/
+web_root = node@nodejs.org:~/web/nodejs.org/
+
+#
+# Because we recursively call make from waf we need to make sure that we are
+# using the correct make. Not all makes are GNU Make, but this likely only
+# works with gnu make. To deal with this we remember how the user invoked us
+# via a make builtin variable and use that in all subsequent operations
+#
+export NODE_MAKE := $(MAKE)

 all: program
+	@-[ -f out/Release/node ] && ls -lh out/Release/node

 all-progress:
 	@$(WAF) -p build
@@ -25,12 +34,18 @@ uninstall:
 test: all
 	python tools/test.py --mode=release simple message

+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-all: all
 	python tools/test.py --mode=debug,release

+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

@@ -52,56 +67,55 @@ test-pummel: all
 test-internet: all
 	python tools/test.py internet

-build/default/node: all
+
+out/Release/node: all

 apidoc_sources = $(wildcard doc/api/*.markdown)
-apidocs = $(addprefix build/,$(apidoc_sources:.markdown=.html))
+apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))

-apidoc_dirs = build/doc build/doc/api/ build/doc/api/assets
+apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets

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

 website_files = \
-	build/doc/index.html    \
-	build/doc/cla.html      \
-	build/doc/sh_main.js    \
-	build/doc/sh_javascript.min.js \
-	build/doc/sh_vim-dark.css \
-	build/doc/logo.png      \
-	build/doc/sponsored.png \
-	build/doc/pipe.css
+	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/logo.png      \
+	out/doc/sponsored.png \
+  out/doc/favicon.ico   \
+	out/doc/pipe.css
+
+doc: doc
+
+out/doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)

-doc: build/default/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) build/doc/changelog.html

 $(apidoc_dirs):
 	mkdir -p $@

-build/doc/api/assets/%: doc/api_assets/% build/doc/api/assets/
+out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
 	cp $< $@

-build/doc/%: doc/%
+out/doc/%: doc/%
 	cp $< $@

-build/doc/api/%.html: doc/api/%.markdown build/default/node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
-	build/default/node tools/doctool/doctool.js doc/template.html $< > $@
+out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
+	out/Release/node tools/doctool/doctool.js doc/template.html $< > $@

-build/doc/changelog.html: ChangeLog build/default/node build/doc/ $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
-	build/default/node tools/doctool/doctool.js doc/template.html $< \
-	| sed 's|assets/|api/assets/|g' \
-	| sed 's|<body>|<body id="changelog">|g' > $@
-	@echo $(apiassets)
-
-
-build/doc/%:
+out/doc/%:

 website-upload: doc
-	scp -r build/doc/* $(web_root)
+	scp -r out/doc/* $(web_root)

-docopen: build/doc/api/all.html
-	-google-chrome build/doc/api/all.html
+docopen: out/doc/api/all.html
+	-google-chrome out/doc/api/all.html

 docclean:
-	-rm -rf build/doc
+	-rm -rf out/doc

 clean:
 	$(WAF) clean
@@ -109,25 +123,40 @@ clean:

 distclean: docclean
 	-find tools -name "*.pyc" | xargs rm -f
-	-rm -rf build/ node node_g
+	-rm -rf dist-osx
+	-rm -rf out/ node node_g

 check:
 	@tools/waf-light check

-VERSION=$(shell git describe)
+VERSION=v$(shell python tools/getnodeversion.py)
 TARNAME=node-$(VERSION)
+TARBALL=$(TARNAME).tar.gz
+PKG=dist-osx/$(TARNAME).pkg

 #dist: doc/node.1 doc/api
-dist: doc
+dist: $(TARBALL) $(PKG)
+
+$(PKG):
+	-rm -rf dist-osx
+	tools/osx-dist.sh
+
+$(TARBALL): out/doc
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
 	mkdir -p $(TARNAME)/doc
 	cp doc/node.1 $(TARNAME)/doc/node.1
-	cp -r build/doc/api $(TARNAME)/doc/api
+	cp -r out/doc/api $(TARNAME)/doc/api
 	rm -rf $(TARNAME)/deps/v8/test # too big
+	rm -rf $(TARNAME)/doc/logos # too big
 	tar -cf $(TARNAME).tar $(TARNAME)
 	rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar

+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

@@ -144,4 +173,4 @@ cpplint:

 lint: jslint cpplint

-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean dist-upload check uninstall install all program staticlib dynamiclib test test-all website-upload
--- a/319
+++ b/319
@@ -0,0 +1,319 @@
+BUILDTYPE ?= Release
+
+all: out/Makefile
+	tools/gyp_node -f make
+	$(MAKE) -C out BUILDTYPE=$(BUILDTYPE)
+	-ln -fs out/Release/node node
+	-ln -fs out/Debug/node node_g
+
+out/Release/node: all
+
+out/Makefile: node.gyp deps/uv/uv.gyp
+
+clean:
+	rm -rf out
+
+distclean:
+	rm -rf out
+
+test: all
+	python tools/test.py --mode=release simple message
+
+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-all: all
+	python tools/test.py --mode=debug,release
+
+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
+
+UVTEST += simple/test-assert
+UVTEST += simple/test-buffer
+UVTEST += simple/test-c-ares
+UVTEST += simple/test-chdir
+UVTEST += simple/test-delayed-require
+UVTEST += simple/test-eio-race2
+UVTEST += simple/test-eio-race4
+UVTEST += simple/test-event-emitter-add-listeners
+UVTEST += simple/test-event-emitter-modify-in-emit
+UVTEST += simple/test-event-emitter-num-args
+UVTEST += simple/test-event-emitter-once
+UVTEST += simple/test-event-emitter-remove-all-listeners
+UVTEST += simple/test-event-emitter-remove-listeners
+UVTEST += simple/test-exception-handler
+UVTEST += simple/test-exception-handler2
+UVTEST += simple/test-exception-handler
+UVTEST += simple/test-executable-path
+UVTEST += simple/test-file-read-noexist
+UVTEST += simple/test-file-write-stream
+UVTEST += simple/test-fs-fsync
+UVTEST += simple/test-fs-open
+UVTEST += simple/test-fs-readfile-empty
+UVTEST += simple/test-fs-read-file-sync
+UVTEST += simple/test-fs-read-file-sync-hostname
+UVTEST += simple/test-fs-sir-writes-alot
+UVTEST += simple/test-fs-write
+UVTEST += simple/test-fs-write-buffer
+UVTEST += simple/test-fs-write-file
+UVTEST += simple/test-fs-write-file-buffer
+UVTEST += simple/test-fs-write-stream
+UVTEST += simple/test-fs-write-stream-end
+UVTEST += simple/test-fs-write-sync
+UVTEST += simple/test-global
+UVTEST += simple/test-http
+UVTEST += simple/test-http-1.0
+UVTEST += simple/test-http-abort-client
+UVTEST += simple/test-http-allow-req-after-204-res
+UVTEST += simple/test-http-blank-header
+UVTEST += simple/test-http-buffer-sanity
+UVTEST += simple/test-http-cat
+UVTEST += simple/test-http-chunked
+UVTEST += simple/test-http-client-abort
+UVTEST += simple/test-http-client-parse-error
+UVTEST += simple/test-http-client-race
+UVTEST += simple/test-http-client-race-2
+UVTEST += simple/test-http-client-upload
+UVTEST += simple/test-http-client-upload-buf
+UVTEST += simple/test-http-contentLength0
+UVTEST += simple/test-http-default-encoding
+UVTEST += simple/test-http-dns-fail
+UVTEST += simple/test-http-eof-on-connect
+UVTEST += simple/test-http-exceptions
+UVTEST += simple/test-http-expect-continue
+UVTEST += simple/test-http-extra-response
+UVTEST += simple/test-http-head-request
+UVTEST += simple/test-http-head-response-has-no-body
+UVTEST += simple/test-http-keep-alive
+UVTEST += simple/test-http-keep-alive-close-on-header
+UVTEST += simple/test-http-malformed-request
+UVTEST += simple/test-http-many-keep-alive-connections
+UVTEST += simple/test-http-mutable-headers
+UVTEST += simple/test-http-parser
+UVTEST += simple/test-http-proxy
+UVTEST += simple/test-http-request-end
+UVTEST += simple/test-http-response-close
+UVTEST += simple/test-http-response-readable
+UVTEST += simple/test-http-unix-socket
+UVTEST += simple/test-http-server
+UVTEST += simple/test-http-server-multiheaders
+UVTEST += simple/test-http-set-cookies
+UVTEST += simple/test-http-set-timeout
+UVTEST += simple/test-http-set-trailers
+UVTEST += simple/test-http-upgrade-agent
+UVTEST += simple/test-http-upgrade-client
+UVTEST += simple/test-http-upgrade-client2
+UVTEST += simple/test-http-upgrade-server
+UVTEST += simple/test-http-upgrade-server2
+UVTEST += simple/test-http-wget
+UVTEST += simple/test-http-write-empty-string
+UVTEST += simple/test-http-wget
+UVTEST += simple/test-mkdir-rmdir
+UVTEST += simple/test-net-binary
+UVTEST += simple/test-net-pingpong
+UVTEST += simple/test-net-can-reset-timeout
+UVTEST += simple/test-net-connect-buffer
+UVTEST += simple/test-net-connect-timeout
+UVTEST += simple/test-net-create-connection
+UVTEST += simple/test-net-eaddrinuse
+UVTEST += simple/test-net-isip
+UVTEST += simple/test-net-keepalive
+UVTEST += simple/test-net-pingpong
+UVTEST += simple/test-net-reconnect
+UVTEST += simple/test-net-remote-address-port
+UVTEST += simple/test-net-server-bind
+UVTEST += simple/test-net-server-max-connections
+UVTEST += simple/test-net-server-try-ports
+UVTEST += simple/test-net-stream
+UVTEST += simple/test-net-socket-timeout
+UVTEST += simple/test-next-tick
+UVTEST += simple/test-next-tick-doesnt-hang
+UVTEST += simple/test-next-tick-errors
+UVTEST += simple/test-next-tick-ordering
+UVTEST += simple/test-next-tick-ordering2
+UVTEST += simple/test-next-tick-starvation
+UVTEST += simple/test-module-load-list
+UVTEST += simple/test-path
+UVTEST += simple/test-pipe-stream
+UVTEST += simple/test-pump-file2tcp
+UVTEST += simple/test-pump-file2tcp-noexist
+UVTEST += simple/test-punycode
+UVTEST += simple/test-querystring
+UVTEST += simple/test-readdir
+UVTEST += simple/test-readdouble
+UVTEST += simple/test-readfloat
+UVTEST += simple/test-readint
+UVTEST += simple/test-readuint
+UVTEST += simple/test-regress-GH-819
+UVTEST += simple/test-regress-GH-897
+UVTEST += simple/test-regression-object-prototype
+UVTEST += simple/test-require-cache
+UVTEST += simple/test-require-cache-without-stat
+UVTEST += simple/test-require-exceptions
+UVTEST += simple/test-require-resolve
+UVTEST += simple/test-script-context
+UVTEST += simple/test-script-new
+UVTEST += simple/test-script-static-context
+UVTEST += simple/test-script-static-new
+UVTEST += simple/test-script-static-this
+UVTEST += simple/test-script-this
+UVTEST += simple/test-stream-pipe-cleanup
+UVTEST += simple/test-stream-pipe-error-handling
+UVTEST += simple/test-stream-pipe-event
+UVTEST += simple/test-stream-pipe-multi
+UVTEST += simple/test-string-decoder
+UVTEST += simple/test-sys
+UVTEST += simple/test-tcp-wrap
+UVTEST += simple/test-tcp-wrap-connect
+UVTEST += simple/test-tcp-wrap-listen
+UVTEST += simple/test-timers-linked-list
+UVTEST += simple/test-tty-stdout-end
+UVTEST += simple/test-url
+UVTEST += simple/test-utf8-scripts
+UVTEST += simple/test-vm-create-context-circular-reference
+UVTEST += simple/test-writedouble
+UVTEST += simple/test-writefloat
+UVTEST += simple/test-writeint
+UVTEST += simple/test-writeuint
+UVTEST += simple/test-zerolengthbufferbug
+UVTEST += pummel/test-http-client-reconnect-bug
+UVTEST += pummel/test-http-upload-timeout
+UVTEST += pummel/test-net-many-clients
+UVTEST += pummel/test-net-pause
+UVTEST += pummel/test-net-pingpong-delay
+UVTEST += pummel/test-net-timeout
+UVTEST += pummel/test-timers
+UVTEST += pummel/test-timer-wrap
+UVTEST += pummel/test-timer-wrap2
+UVTEST += pummel/test-vm-memleak
+UVTEST += internet/test-dns
+UVTEST += simple/test-tls-client-abort
+UVTEST += simple/test-tls-client-verify
+UVTEST += simple/test-tls-connect
+#UVTEST += simple/test-tls-ext-key-usage # broken
+UVTEST += simple/test-tls-junk-closes-server
+UVTEST += simple/test-tls-npn-server-client
+UVTEST += simple/test-tls-request-timeout
+#UVTEST += simple/test-tls-securepair-client # broken
+UVTEST += simple/test-tls-securepair-server 
+#UVTEST += simple/test-tls-server-verify # broken
+UVTEST += simple/test-tls-set-encoding
+
+# child_process
+UVTEST += simple/test-child-process-exit-code
+UVTEST += simple/test-child-process-buffering
+UVTEST += simple/test-child-process-exec-cwd
+UVTEST += simple/test-child-process-cwd
+UVTEST += simple/test-child-process-env
+UVTEST += simple/test-child-process-stdin
+UVTEST += simple/test-child-process-ipc
+UVTEST += simple/test-child-process-deprecated-api
+
+
+test-uv: all
+	NODE_USE_UV=1 python tools/test.py $(UVTEST)
+
+test-uv-debug: all
+	NODE_USE_UV=1 python tools/test.py --mode=debug $(UVTEST)
+
+
+apidoc_sources = $(wildcard doc/api/*.markdown)
+apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
+
+apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets
+
+apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*)))
+
+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/logo.png      \
+	out/doc/sponsored.png \
+  out/doc/favicon.ico   \
+	out/doc/pipe.css
+
+doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
+
+$(apidoc_dirs):
+	mkdir -p $@
+
+out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
+	cp $< $@
+
+out/doc/%: doc/%
+	cp $< $@
+
+out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
+	out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
+
+out/doc/%:
+
+website-upload: doc
+	scp -r out/doc/* $(web_root)
+
+docopen: out/doc/api/all.html
+	-google-chrome out/doc/api/all.html
+
+docclean:
+	-rm -rf out/doc
+
+VERSION=$(shell git describe)
+TARNAME=node-$(VERSION)
+
+#dist: doc/node.1 doc/api
+dist: doc
+	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
+	mkdir -p $(TARNAME)/doc
+	cp doc/node.1 $(TARNAME)/doc/node.1
+	cp -r out/doc/api $(TARNAME)/doc/api
+	rm -rf $(TARNAME)/deps/v8/test # too big
+	rm -rf $(TARNAME)/doc/logos # too big
+	tar -cf $(TARNAME).tar $(TARNAME)
+	rm -rf $(TARNAME)
+	gzip -f -9 $(TARNAME).tar
+
+bench:
+	 benchmark/http_simple_bench.sh
+
+bench-idle:
+	./node benchmark/idle_server.js &
+	sleep 1
+	./node benchmark/idle_clients.js &
+
+jslint:
+	PYTHONPATH=tools/closure_linter/ python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/
+
+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 all program staticlib dynamiclib test test-all website-upload
--- a/Makefile.cmake
+++ b/Makefile.cmake
@@ -1,40 +0,0 @@
-BUILD?=build
-VERBOSE?=0
-PARALLEL_JOBS?=1
-CMAKE?=cmake
-TOOLCHAIN_FILE=#./cmake/codesourcery-arm-toolchain.cmake
-
-all: package
-
-$(BUILD)/Makefile:
-	mkdir $(BUILD) || exit 0
-	cd $(BUILD) && $(CMAKE) -DCMAKE_VERBOSE_MAKEFILE=$(VERBOSE) -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) ..
-
-build: $(BUILD)/Makefile
-	cd $(BUILD) && make -j $(PARALLEL_JOBS)
-
-install: build
-	cd $(BUILD) && sudo make install
-
-clean:
-	rm -rf $(BUILD)
-
-doc: $(BUILD)/Makefile
-	cd $(BUILD) && make doc
-
-package: $(BUILD)/Makefile
-	cd $(BUILD) && make package
-
-test: $(BUILD)/Makefile
-	cd $(BUILD) && make test
-
-cdash: $(BUILD)/Makefile
-	cd $(BUILD) && make Experimental
-
-cdash-cov: $(BUILD)/Makefile
-	cd $(BUILD) && $(CMAKE) -DUSE_GCOV=True .. && make Experimental
-
-cdash-mem: $(BUILD)/Makefile
-	cd $(BUILD) && make NightlyMemoryCheck
-
-.PHONY: build install clean doc package test cdash cdash-cov cdash-mem
--- a/24
+++ b/24
@@ -1,24 +0,0 @@
-Evented I/O for V8 javascript.
-
-To build:
-
-  ./configure
-  make 
-  make install
-
-To run the tests:
-  
-  make test
-
-To build the documentation:
-
-  make doc
- 
-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.cmake
+++ b/README.cmake
@@ -1,77 +0,0 @@
-Instructions for building with cmake
-
-Make sure you have cmake:
-  Ubuntu/Debian: sudo apt-get install cmake
-  Mac: http://www.cmake.org/files/v2.8/cmake-2.8.3-Darwin-universal.dmg
-  Other platforms: http://www.cmake.org/cmake/resources/software.html
-
-To build:
-
-  make -f Makefile.cmake
-  make -f Makefile.cmake install
-
-To run the tests:
-
-  make -f Makefile.cmake test
-
-To build the documentation:
-
-  make -f Makefile.cmake doc
- 
-To read the documentation:
-
-  man doc/node.1
-
-To build distro packages (tgz, deb, rpm, PackageMaker):
-
-  make -f Makefile.cmake package
-
-To submit test results (see http://my.cdash.org/index.php?project=node):
-
-  make -f Makefile.cmake cdash
-
-To submit coverage test results:
-
-  make -f Makefile.cmake cdash-cov
-
-To submit valgrind test results:
-
-  make -f Makefile.cmake cdash-mem
-
-Cross-compiling:
-  An example toolchain file for the CodeSourcery ARM toolchain is included in
-  the cmake directory: codesourcery-arm-toolchain.cmake.
-
-  Install the CodeSourcery toolchain, set the path to the toolchain in
-  cmake/codesourcery-arm-toolchain.cmake, and uncomment the TOOLCHAIN_FILE
-  variable in Makefile.cmake to use it.
-
-  If you are using cmake directly, just add the flag
-  "-DCMAKE_TOOLCHAIN_FILE=/path/to/toolchain-file" when
-  running cmake.
-
-Using cmake directly:
-  cd ~/your-node-source-dir
-  mkdir name-of-build-dir     (can be anything)
-  cd name-of-build-dir
-  cmake ..
-
-  At this point you have generated a set of Makefiles and can use the standard
-  make commands (make, make install, etc.). The Makefile.cmake file is just a
-  wrapper around these commands; take a look at it for more details.
-
-Other build targets:
-  make Experimental
-  make Nightly
-  make NightlyMemoryCheck
-  make Continuous
-
-Additional options:
-  In the CMakeLists.txt, you'll see things like
-  option(SHARED_V8, ...). If you want to enable any of those options you can
-  pass "-DOPTION=True" when running cmake (e.g., cmake -DSHARED_V8=True).
-
-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,46 @@
+Evented I/O for V8 javascript.
+===
+
+### To build:
+
+Unix/Macintosh (requires python >= 2.5.2):
+
+    ./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/33
+++ b/33
@@ -1,33 +0,0 @@
- fix tests for NODE_MODULE_CONTEXTS=1
- readline
-  - fix for two column glyphs. use Markus Kuhn's wcwidth.c
-  - fix for commands that extend beyond term width
- Erradicate all traces of 'binary' encoding. Only used, now, in OpenSSL
-  binding.
- EventSource branch merged
- Use C++ style casts everywhere.
- Ruby-like Process#detach (is that possible?)
- stderr isn't flushing on exit
- ReadStream should not use an offset in calls to fs.read
-  (so that it can pull in files larger than 2G)
- process object should be defined in src/node.js not in c++
- Test for EMFILE accept spin bug.
- Deprecate setEncoding() and instead add option to on('data').
-  Example:
-
-    stdin.on('data', { encoding: 'utf8' }, function (chunk) {
-      process.stdout.write('WRITE: ' + chunk);
-    });
-
-  Perhaps by assigning cb.opts.encoding and calling
-  EventEmitter.optHandlers.encoding() if it exists.
-
- DOCS
-  - anchor links next to each function, for easy linking.
-    EG <a href="#fs.stat">#</a>
-
- "node --raw-js script.js" should bipass all Node code and load a raw V8
-  interpreter
- Use http_parser_execute2() in node_http_parser.cc and make req.pause()
-  work correctly
-  https://github.com/ry/http-parser/blob/c95a5479596e95b7cdd88ca9d7b32fd3afb4379c/http_parser.h#L266
--- a/TODO.win32
+++ b/TODO.win32
@@ -1,99 +0,0 @@
- Implement setenv / unsetenv
-
- Implement other stuff missing in node.cc/process
-  Like getuid, getgid, setgid, kill etc.
-
- Implement missing `net` methods
-  Are unix sockets similar to windows named pipes? If so, should they be 
-  supported? -> currently: no. Complication: they block.
-
- New libev backend
-  The current libev backend supports sockets only. This complicates stuff like
-  child processes, stdio. Best would be if node_net switched from exposing
-  readyness notifications to using completion notifications, so on windows we
-  could use IOCP for sockets. Experts tell me that is really the fastest way
-  to work with sockets on windows.
-
- Child process issues
-  * Communication between parent and child is slow; it uses a socketpair
-    where a pipe would be much faster. Replace it by a pipe when there
-    is a libev backend that supports waiting for a pipe.
-  * When a child process spawns the pid is not available straightaway.
-    On linux the pid is available immediately because fork() doesn't
-    block; on windows a libeio thread is used to call CreateProcess.
-    So this can't really be fixed, but it could be worked around by adding a
-    'spawn' or 'pid' event.
-  * kill() doesn't work when the pid is not available yet. All the plumbing
-    is there to make it work, but lib/child_process.js just doesn't call
-    ChildProcess::Kill() as long as the pid is not known.
-  * passing socket custom_fds is not supported
-  * child_process.exec() only works on systems with msys installed.
-    It's because it relies on the 'sh' shell. The default windows shell
-    is 'cmd' and it works a little differently. Maybe add an option to
-    specify the shell to exec()?
-
- Stdio (make TTY's / repl / readline work)
-  This will be hard: there is no ANSI escape code support in windows.
-  Select() doesn't work on TTYs -- use a dedicated `getchar()` thread 
-  that relays everything to an internal socket?
-  Also verify writeError and isStdoutBlocking correctness.
-
- Think about exposing the platform through the process object
-  It sucks but it may be necessary to know which platfom you're running on, e.g.
-  you can't do spawn('grep') on windows (unless there's msys).
-  Something like process.os or process.platform?
-
- Skip/fix tests that can never pass on windows
-
- Find a solution for fs.symlink / fs.lstat / fs.chown
-  Windows has different symlink types: file symlinks (vista+),
-  directory symlinks (vista+), junction points (xp+) 
-
- Handle _open_osfhandle failures
-  E.g. currently we're using the construct _open_osfhandle(socket/open/accept(...)).
-  Now socket() can fail by itself and _open_osfhandle can fail by itself too.
-  If socket() fails it returns -1 so _open_osfhandle fails as well, but and we'll always return/throw EBADF.
-  If _open_osfhandle fails but socket doesn't, a stray handle is left open. It should be fixed.
-
- Check error number mappings.
-  Winsock errnos are sometimes different. Subtracting WSABASEERR from errnos works in most cases.
-
- Think about `make install`
-
- Extensions
-  Should be DLLs on windows.
-
- Link pthreads-w32 statically by default
-
- Link Mingw libraries statically by default
-  Like libstdc++.dll, more maybe.
-  Microsoft libs are always there, no static linkage required (e.g. msvcrt, winsock2).
-
- Make (open?)SSL work
-
- Support using shared libs (libeio, v8, c-ares)
-  Need to link with with a stub library. Libraries should use `dllexport`,
-  headers must have `dllimport`.
-
- V8: push MINGW32 build fixes upstream
-  (mostly done, V8 3.0.0 introduces some new issues)
-
- Work with the V8 team to get the stack corruption bug fixed
-  (fixed in 3.0.0)
-
- Work around missing pread/pwrite more elegantly
-  Currently it's exported from libeio, while it wasn't intended to be exported.
-  The libeio workaround implementation sucks, it uses a global mutex.
-  It should be possible to implement pread and pwrite using winapi's ReadFile/Writefile
-  directly, passing an OVERLAPPED structure while not associating with an completion port.
-
- Work around missing inet_pton/inet_ntop more elegantly
-  Currently it's exported from from c-ares, while it wasn't intended to be exported.
-  It prevents linking c-ares dynamically. 
-
- See what libev/libeio changes can be pushed upstream
-
- 64-bit build
-  Should be possible with MinGW-w64, it's pretty good.
-
- ... much more probably
--- 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/http_simple.js
+++ b/benchmark/http_simple.js
@@ -11,26 +11,6 @@ for (var i = 0; i < 20*1024; i++) {
  fixed += "C";
 }

-var uname, rev;
-
-exec('git rev-list -1 HEAD', function (e, stdout) {
-  if (e) {
-    console.error("Problem executing: 'git rev-list -1 HEAD'");
-    throw new Error(e);
-  }
-  rev = stdout.replace(/\s/g, '');
-});
-
-exec('uname -a', function (e, stdout) {
-  if (e) {
-    console.error("Problem executing: 'uname -a'");
-    throw new Error(e);
-  }
-  uname = stdout.replace(/[\r\n]/g, '');
-});
-
-
-
 stored = {};
 storedBuffer = {};

@@ -39,6 +19,7 @@ var server = http.createServer(function (req, res) {
  var command = commands[1];
  var body = "";
  var arg = commands[2];
+  var n_chunks = parseInt(commands[3], 10);
  var status = 200;

  if (command == "bytes") {
@@ -73,19 +54,32 @@ var server = http.createServer(function (req, res) {
  } else if (command == "fixed") {
    body = fixed;

-  } else if (command == "info") {
-    body = 'rev=' + rev + '\nuname="' + uname + '"\n';
-
  } else {
    status = 404;
    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 = ~~(len / n_chunks) || len;

-  res.writeHead(status, { "Content-Type": "text/plain",
-                          "Content-Length": content_length });
-  res.end(body);
+    for (var i = 0; i < len; i += step) {
+      res.write(body.slice(i, i + step));
+    }
+
+    res.end();
+  } else {
+    var content_length = body.length.toString();
+
+    res.writeHead(status, { "Content-Type": "text/plain",
+                            "Content-Length": content_length });
+    res.end(body);
+  }

 });

@@ -93,3 +87,6 @@ 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_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 = 1, n = os.cpus().length; i < n; ++i) cluster.fork();
+} else {
+  require(__dirname + '/http_simple.js');
+}
--- a/benchmark/io.c
+++ b/benchmark/io.c
@@ -2,41 +2,47 @@
 * 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>
 
-int tsize = 1000 * 1048576;
-const char *path = "/tmp/wt.dat";
+static int c = 0;
+static int tsize = 1000 * 1048576;
+static const char path[] = "/tmp/wt.dat";
+static char buf[65536];

-int c = 0;
+static uint64_t now(void) {
+  struct timeval tv;

-char* bufit(size_t l)
-{
-  char *p = malloc(l);
-  memset(p, '!', l);
-  return p;
+  if (gettimeofday(&tv, NULL))
+    abort();
+
+  return tv.tv_sec * 1000000ULL + tv.tv_usec;
 }

-void writetest(int size, size_t bsize)
+static void writetest(int size, size_t bsize)
 {
  int i;
-  char *buf = bufit(bsize);
-  struct timeval start, end;
+  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);
  }

-  assert(0 ==  gettimeofday(&start, NULL));
+  start = now();
+
  for (i = 0; i < size; i += bsize) {
    int rv = write(fd, buf, bsize);
    if (c++ % 2000 == 0) fprintf(stderr, ".");
@@ -45,35 +51,40 @@ void writetest(int size, size_t bsize)
      exit(254);
    }
  }
-#ifdef __linux__
-  fdatasync(fd);
-#else
-  fsync(fd);
-#endif
  close(fd);
-  assert(0 == gettimeofday(&end, NULL));
-  elapsed = (end.tv_sec - start.tv_sec) + ((double)(end.tv_usec - start.tv_usec))/100000.;
-  mbps = ((tsize/elapsed)) / 1048576;
-  fprintf(stderr, "\nWrote %d bytes in %03fs using %ld byte buffers: %03fmB/s\n", size, elapsed, bsize, mbps);

-  free(buf);
+#ifndef NSYNC
+# ifdef __linux__
+  fdatasync(fd);
+# else
+  fsync(fd);
+# endif
+#endif /* SYNC */
+
+  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;
-  char *buf = bufit(bsize);
-  struct timeval start, end;
+  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);
  }

-  assert(0 == gettimeofday(&start, NULL));
+  start = now();
+
  for (i = 0; i < size; i += bsize) {
    int rv = read(fd, buf, bsize);
    if (rv < 0) {
@@ -82,12 +93,12 @@ void readtest(int size, size_t bsize)
    }
  }
  close(fd);
-  assert(0 == gettimeofday(&end, NULL));
-  elapsed = (end.tv_sec - start.tv_sec) + ((double)(end.tv_usec - start.tv_usec))/100000.;
-  mbps = ((tsize/elapsed)) / 1048576;
-  fprintf(stderr, "Read %d bytes in %03fs using %ld byte buffers: %03fmB/s\n", size, elapsed, bsize, mbps);

-  free(buf);
+  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() {
--- 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/report-startup-memory.js
+++ b/benchmark/report-startup-memory.js
@@ -0,0 +1 @@
+console.log(process.memoryUsage().rss);
--- a/benchmark/static_http_server.js
+++ b/benchmark/static_http_server.js
@@ -1,48 +1,43 @@
-var http = require("http");
+var http = require('http');

 var concurrency = 30;
 var port = 12346;
-var n = 7; // several orders of magnitude slower
+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) {
+var server = http.createServer(function(req, res) {
  res.writeHead(200, {
-    "Content-Type": "text/plain",
-    "Content-Length": body.length
+    'Content-Type': 'text/plain',
+    'Content-Length': body.length
  });
-  res.write(body);
-  res.close();
+  res.end(body);
 })
-server.listen(port);

-function responseListener (res) {
-  res.addListener("end", function () {
-    if (requests < n) {
-      var req = res.client.request("/");
-      req.addListener('response', responseListener);
-      req.close();
-      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;
-  var req = client.request("/");
-  req.addListener('response', responseListener);
-  req.close();
-  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/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/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/cmake/CTestCustom.cmake
+++ b/cmake/CTestCustom.cmake
@@ -1,2 +0,0 @@
-set(CTEST_CUSTOM_PRE_TEST "sh -c \"rm -rf ../test/tmp && mkdir ../test/tmp\"")
-set(CTEST_CUSTOM_POST_TEST ${CTEST_CUSTOM_PRE_TEST})
--- a/cmake/codesourcery-arm-toolchain.cmake
+++ b/cmake/codesourcery-arm-toolchain.cmake
@@ -1,22 +0,0 @@
-set(toolchain_dir #SET THIS TO YOUR TOOLCHAIN PATH)
-set(toolchain_bin_dir ${toolchain_dir}/bin)
-set(toolchain_libc_dir ${toolchain_dir}/arm-none-linux-gnueabi/libc)
-set(toolchain_inc_dir ${toolchain_libc_dir}/include)
-set(toolchain_lib_dir ${toolchain_libc_dir}/usr/lib)
-
-set(CMAKE_SYSTEM_NAME Linux CACHE INTERNAL "system name")
-set(CMAKE_SYSTEM_PROCESSOR arm CACHE INTERNAL "processor")
-set(CMAKE_C_COMPILER ${toolchain_bin_dir}/arm-none-linux-gnueabi-gcc)
-set(CMAKE_CXX_COMPILER ${toolchain_bin_dir}/arm-none-linux-gnueabi-g++)
-set(CMAKE_C_FLAGS "-isystem ${toolchain_inc_dir}" CACHE INTERNAL "c compiler flags")
-set(CMAKE_CXX_FLAGS "-isystem ${toolchain_inc_dir}" CACHE INTERNAL "cxx compiler flags")
-
-set(link_flags -L${toolchain_lib_dir})
-
-set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags")
-set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags")
-set(CMAKE_SHARED_LINKER_FLAGS ${link_flags} CACHE INTERNAL "shared lnk flags")
-set(CMAKE_FIND_ROOT_PATH ${toolchain_libc_dir} CACHE INTERNAL "cross root directory")
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH CACHE INTERNAL "")
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY CACHE INTERNAL "")
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY CACHE INTERNAL "")
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -1,82 +0,0 @@
-#
-# configure node for building
-#
-include(CheckFunctionExists)
-
-
-if(NOT "v${CMAKE_BUILD_TYPE}" MATCHES vDebug)
-  set(CMAKE_BUILD_TYPE "Release")
-endif()
-
-string(TOLOWER ${CMAKE_SYSTEM_NAME} node_platform)
-
-# Get system architecture
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)
-  set(node_arch x86)
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*)
-  set(node_arch x86)
-else()
-  set(node_arch ${CMAKE_SYSTEM_PROCESSOR})
-endif()
-
-if(${node_arch} MATCHES unknown)
-  set(node_arch x86)
-endif()
-
-
-# Copy tools directory for out-of-source build
-string(COMPARE EQUAL $(PROJECT_BINARY_DIR) ${PROJECT_SOURCE_DIR} in_source_build)
-if(NOT ${in_source_build})
-  execute_process(COMMAND cmake -E copy_directory ${PROJECT_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools)
-endif()
-
-# Set some compiler/linker flags..
-set(CMAKE_C_FLAGS_DEBUG "-O0 -Wall -g -Wextra -DDEBUG $ENV{CFLAGS}")
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -Wall -g -Wextra -DDEBUG $ENV{CXXFLAGS}")
-
-set(CMAKE_C_FLAGS_RELEASE "-g -O3 -DNDEBUG $ENV{CFLAGS}")
-set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -DNDEBUG $ENV{CXXFLAGS}")
-
-if(${node_platform} MATCHES sunos)
-  add_definitions(-threads)
-elseif(NOT ${node_platform} MATCHES cygwin*)
-  add_definitions(-pthread)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -rdynamic")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
-endif()
-
-if(${node_platform} MATCHES darwin)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Carbon")
-endif()
-
-check_function_exists(fdatasync HAVE_FDATASYNC)
-if(HAVE_FDATASYNC)
-  add_definitions(-DHAVE_FDATASYNC=1)
-else()
-  add_definitions(-DHAVE_FDATASYNC=0)
-endif()
-
-add_definitions(
-  -DPLATFORM=${node_platform}
-  -DX_STACKSIZE=65536
-  -D_LARGEFILE_SOURCE
-  -D_FILE_OFFSET_BITS=64
-  -DEV_MULTIPLICITY=0
-  )
-
-# set the exec output path to be compatible with the current waf build system
-if(${CMAKE_BUILD_TYPE} MATCHES Debug)
-  set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/debug/)
-else()
-  set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/default/)
-endif()
-
-#
-## ---------------------------------------------------------
-#
-
-file(GLOB js2c_files ${PROJECT_SOURCE_DIR}/lib/*.js)
-set(js2c_files ${PROJECT_SOURCE_DIR}/src/node.js ${js2c_files})
-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/src)
-
--- a/cmake/docs.cmake
+++ b/cmake/docs.cmake
@@ -1,80 +0,0 @@
-#
-# docs
-#
-
-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/doc)
-
-set(node_binary ${PROJECT_BINARY_DIR}/default/node)
-set(doctool tools/doctool/doctool.js)
-set(changelog_html ${PROJECT_BINARY_DIR}/doc/changelog.html)
-
-file(GLOB_RECURSE doc_sources RELATIVE ${PROJECT_SOURCE_DIR} doc/*)
-
-foreach(FILE ${doc_sources})
-  string(REGEX REPLACE "(.*)api_assets(.*)" "\\1api/assets\\2" OUT_FILE ${FILE})
-  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${OUT_FILE}
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/${FILE} ${PROJECT_BINARY_DIR}/${OUT_FILE}
-    DEPENDS ${PROJECT_SOURCE_DIR}/${FILE}
-    )
-  list(APPEND doc_sources_copy ${PROJECT_BINARY_DIR}/${OUT_FILE})
-endforeach()
-
-file(GLOB_RECURSE api_markdown RELATIVE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/doc/api/*)
-
-foreach(file ${api_markdown})
-  string(REGEX REPLACE "(.*)\\.markdown" "\\1" tmp ${file})
-  set(api_basenames ${api_basenames} ${tmp})
-endforeach()
-
-foreach(api ${api_basenames})
-  set(api_html ${api_html} ${PROJECT_BINARY_DIR}/${api}.html)
-  add_custom_command(
-    OUTPUT "${PROJECT_BINARY_DIR}/${api}.html"
-    COMMAND ${node_binary} ${doctool} ${PROJECT_BINARY_DIR}/doc/template.html "${PROJECT_BINARY_DIR}/${api}.markdown" > "${PROJECT_BINARY_DIR}/${api}.html"
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-    DEPENDS node ${doctool} ${doc_sources_copy}
-    VERBATIM
-    )
-endforeach()
-
-add_custom_target(
-  doc
-  DEPENDS node ${doc_sources_copy} ${api_html} ${changelog_html}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-  )
-
-#add_custom_command(
-#  OUTPUT ${PROJECT_BINARY_DIR}/doc/api.html
-#  COMMAND ${PROJECT_BINARY_DIR}/default/node tools/ronnjs/bin/ronn.js --fragment doc/api.markdown
-#    | sed "s/<h2>\\\(.*\\\)<\\/h2>/<h2 id=\"\\1\">\\1<\\/h2>/g"
-#    | cat doc/api_header.html - doc/api_footer.html > ${PROJECT_BINARY_DIR}/doc/api.html
-#  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-#  DEPENDS node doc/api.markdown doc/api_header.html doc/api_footer.html
-#  VERBATIM
-#  )
-
-add_custom_command(
-  OUTPUT ${changelog_html}
-  COMMAND ${node_binary} ${doctool} doc/template.html ChangeLog
-    | sed "s|assets/|api/assets/|g"
-    | sed "s|<body>|<body id=\"changelog\">|g" > ${changelog_html}
-  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-  DEPENDS ChangeLog node ${doctool} ${doc_sources_copy}
-  VERBATIM
-  )
-
-#add_custom_command(
-#  OUTPUT ${PROJECT_BINARY_DIR}/doc/changelog.html
-#  COMMAND cat doc/changelog_header.html ChangeLog doc/changelog_footer.html > ${PROJECT_BINARY_DIR}/doc/changelog.html
-#  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-#  DEPENDS ChangeLog doc/changelog_header.html doc/changelog_footer.html
-#  VERBATIM
-#  )
-
-#add_custom_command(
-#  OUTPUT ${PROJECT_BINARY_DIR}/doc/node.1
-#  COMMAND ${PROJECT_BINARY_DIR}/default/node tools/ronnjs/bin/ronn.js --roff doc/api.markdown > ${PROJECT_BINARY_DIR}/doc/node.1
-#  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-#  DEPENDS node doc/api.markdown tools/ronnjs/bin/ronn.js
-#  VERBATIM
-#  )
--- a/cmake/libc-ares.cmake
+++ b/cmake/libc-ares.cmake
@@ -1,18 +0,0 @@
-if(SHARED_CARES)
-  find_library(LIBCARES_LIBRARY NAMES cares)
-  find_path(LIBCARES_INCLUDE_DIR ares.h
-    PATH_SUFFIXES include
-    ) # Find header
-  find_package_handle_standard_args(libcares DEFAULT_MSG LIBCARES_LIBRARY LIBCARES_INCLUDE_DIR)
-else()
-  set(cares_arch ${node_arch})
-
-  if(${node_arch} MATCHES x86_64)
-    set(cares_arch x64)
-  elseif(${node_arch} MATCHES x86)
-    set(cares_arch ia32)
-  endif()
-
-  add_subdirectory(deps/c-ares)
-  set(LIBCARES_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/c-ares ${CMAKE_SOURCE_DIR}/deps/c-ares/${node_platform}-${cares_arch})
-endif()
--- a/cmake/libev.cmake
+++ b/cmake/libev.cmake
@@ -1,10 +0,0 @@
-if(SHARED_LIBEV)
-  find_library(LIBEV_LIBRARY NAMES ev)
-  find_path(LIBEV_INCLUDE_DIR ev.h
-    PATH_SUFFIXES include/ev include
-    ) # Find header
-  find_package_handle_standard_args(libev DEFAULT_MSG LIBEV_LIBRARY LIBEV_INCLUDE_DIR)
-else()
-  add_subdirectory(deps/libev)
-  set(LIBEV_INCLUDE_DIR deps/libev)
-endif()
--- a/cmake/libs.cmake
+++ b/cmake/libs.cmake
@@ -1,55 +0,0 @@
-#
-# libraries
-#
-
-include(CheckLibraryExists)
-include(FindPackageHandleStandardArgs)
-set(HAVE_CONFIG_H True)
-add_definitions(-DHAVE_CONFIG_H=1)
-
-find_package(OpenSSL QUIET)
-find_package(Threads)
-find_library(RT rt)
-find_library(DL dl)
-check_library_exists(socket socket "" HAVE_SOCKET_LIB)
-check_library_exists(nsl gethostbyname "" HAVE_NSL_LIB)
-check_library_exists(util openpty "" HAVE_UTIL_LIB)
-
-if(RT)
-  set(extra_libs ${extra_libs} ${RT})
-endif()
-
-if(DL)
-  set(extra_libs ${extra_libs} ${DL})
-endif()
-
-if(${node_platform} MATCHES freebsd)
-  find_library(KVM NAMES kvm)
-  set(extra_libs ${extra_libs} KVM)
-endif()
-
-if(${HAVE_SOCKET_LIB})
-  set(extra_libs ${extra_libs} socket)
-endif()
-
-if(${HAVE_NSL_LIB})
-  set(extra_libs ${extra_libs} nsl)
-endif()
-
-if(HAVE_UTIL_LIB)
-  set(extra_libs ${extra_libs} util)
-endif()
-
-if(OPENSSL_FOUND)
-  add_definitions(-DHAVE_OPENSSL=1)
-  set(HAVE_OPENSSL True)
-  set(node_extra_src ${node_extra_src} src/node_crypto.cc)
-  set(extra_libs ${extra_libs} ${OPENSSL_LIBRARIES})
-endif()
-
-include("cmake/libc-ares.cmake")
-include("cmake/libev.cmake")
-include("cmake/libv8.cmake")
-
-add_subdirectory(deps/libeio)
-add_subdirectory(deps/http_parser)
--- a/cmake/libv8.cmake
+++ b/cmake/libv8.cmake
@@ -1,25 +0,0 @@
-set(V8_INCLUDE_NAMES v8.h v8-debug.h v8-profiler.h v8stdint.h)
-set(V8_LIBRARY_NAMES v8)
-
-if(SHARED_V8)
-  find_path(V8_INCLUDE_DIR NAMES ${V8_INCLUDE_NAMES})
-  find_library(V8_LIBRARY_PATH NAMES ${V8_LIBRARY_NAMES} NO_CMAKE_PATH)
-else()
-  set(V8_INCLUDE_DIR "${PROJECT_BINARY_DIR}/deps/v8/include")
-  if(${CMAKE_BUILD_TYPE} MATCHES Debug)
-    set(v8_fn "libv8_g.a")
-  else()
-    set(v8_fn "libv8.a")
-  endif()
-  set(V8_LIBRARY_PATH "${PROJECT_BINARY_DIR}/deps/v8/${v8_fn}")
-  install(DIRECTORY
-      ## Do NOT remove the trailing slash
-      ## it is required so that v8 headers are
-      ## copied directly into include/node
-      ## rather than in a subdirectory
-      ## See CMake's install(DIRECTORY) manual for details
-      ${V8_INCLUDE_DIR}/
-
-      DESTINATION include/node
-  )
-endif()
--- a/cmake/node_build.cmake
+++ b/cmake/node_build.cmake
@@ -1,91 +0,0 @@
-#
-# node build stuff
-#
-
-add_custom_command(
-  OUTPUT ${PROJECT_BINARY_DIR}/src/node_natives.h
-  COMMAND ${PYTHON_EXECUTABLE} tools/js2c.py ${PROJECT_BINARY_DIR}/src/node_natives.h ${js2c_files}
-  DEPENDS ${js2c_files})
-
-set(node_platform_src "src/platform_${node_platform}.cc")
-
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/${node_platform_src})
-  set(node_extra_src ${node_extra_src} "src/platform_none.cc")
-else()
-  set(node_extra_src ${node_extra_src} ${node_platform_src})
-endif()
-
-set(node_sources
-  src/node_main.cc
-  src/node.cc
-  src/node_buffer.cc
-  src/node_javascript.cc
-  src/node_extensions.cc
-  src/node_http_parser.cc
-  src/node_net.cc
-  src/node_io_watcher.cc
-  src/node_child_process.cc
-  src/node_constants.cc
-  src/node_cares.cc
-  src/node_events.cc
-  src/node_file.cc
-  src/node_signal_watcher.cc
-  src/node_stat_watcher.cc
-  src/node_stdio.cc
-  src/node_timer.cc
-  src/node_script.cc
-  src/node_os.cc
-  src/node_natives.h
-  ${node_extra_src})
-
-# Set up PREFIX, CCFLAGS, and CPPFLAGS for node_config.h
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
-if(${CMAKE_BUILD_TYPE} MATCHES Debug)
-  set(CCFLAGS "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS}")
-else()
-  set(CCFLAGS "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS}")
-endif()
-get_directory_property(compile_defs COMPILE_DEFINITIONS)
-foreach(def ${compile_defs})
-  set(CPPFLAGS "${CPPFLAGS} -D${def}")
-endforeach()
-
-configure_file(src/node_config.h.in ${PROJECT_BINARY_DIR}/src/node_config.h)
-configure_file(config.h.cmake ${PROJECT_BINARY_DIR}/config.h)
-
-include_directories(
-  src
-  deps/libeio
-  deps/http_parser
-  ${V8_INCLUDE_DIR}
-  ${LIBEV_INCLUDE_DIR}
-  ${LIBCARES_INCLUDE_DIR}
-
-  ${PROJECT_BINARY_DIR}
-  ${PROJECT_BINARY_DIR}/src
-)
-
-add_executable(node ${node_sources})
-set_target_properties(node PROPERTIES DEBUG_POSTFIX "_g")
-target_link_libraries(node
-  ev
-  eio
-  cares
-  http_parser
-  ${V8_LIBRARY_PATH}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${extra_libs})
-
-
-install(TARGETS node RUNTIME DESTINATION bin)
-install(FILES     
-  ${PROJECT_BINARY_DIR}/config.h
-  src/node.h
-  src/node_object_wrap.h
-  src/node_buffer.h
-  src/node_events.h
-  src/node_version.h
-  ${PROJECT_BINARY_DIR}/src/node_config.h
-
-  DESTINATION include/node
-)
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -1,35 +0,0 @@
-#
-# package
-#
-
-if(${node_platform} MATCHES darwin)
-  set(CPACK_GENERATOR "TGZ;PackageMaker")
-  # CPack requires the files to end in .txt
-  configure_file(LICENSE ${PROJECT_BINARY_DIR}/LICENSE.txt COPYONLY)
-  configure_file(ChangeLog ${PROJECT_BINARY_DIR}/ChangeLog.txt COPYONLY)
-  set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_BINARY_DIR}/LICENSE.txt")
-  set(CPACK_RESOURCE_FILE_README "${PROJECT_BINARY_DIR}/ChangeLog.txt")
-  #set(CPACK_RESOURCE_FILE_WELCOME "")
-elseif(${node_platform} MATCHES linux)
-  set(CPACK_GENERATOR "TGZ;DEB;RPM")
-else()
-  set(CPACK_GENERATOR "TGZ")
-endif()
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Tom Hughes <tom.hughes@palm.com>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Evented I/O for V8 JavaScript.")
-set(CPACK_PACKAGE_DESCRIPTION "Evented I/O for V8 JavaScript.
- Node's goal is to provide an easy way to build scalable network programs.
- Node is similar in design to and influenced by systems like Ruby's Event
- Machine or Python's Twisted. Node takes the event model a bit further—it
- presents the event loop as a language construct instead of as a library.")
-set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}")
-set(CPACK_DEBIAN_PACKAGE_SECTION "web")
-file(READ ${PROJECT_SOURCE_DIR}/src/node_version.h node_version_h LIMIT 1024 OFFSET 0)
-string(REGEX REPLACE ".*NODE_MAJOR_VERSION[ ]*([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MAJOR "${node_version_h}")
-string(REGEX REPLACE ".*NODE_MINOR_VERSION[ ]*([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MINOR "${node_version_h}")
-string(REGEX REPLACE ".*NODE_PATCH_VERSION[ ]*([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_PATCH "${node_version_h}")
-set(node_version_string "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
-# Note: this is intentionally at the bottom so that the above CPACK variables
-# are used by CPack.
-include(CPack)
--- a/cmake/v8_build.cmake
+++ b/cmake/v8_build.cmake
@@ -1,92 +0,0 @@
-#
-# v8 build stuff
-#
-
-string(TOLOWER ${CMAKE_BUILD_TYPE} v8mode)
-set(v8arch ${node_arch})
-
-if(${node_arch} MATCHES x86_64)
-  set(v8arch x64)
-elseif(${node_arch} MATCHES x86)
-  set(v8arch ia32)
-endif()
-
-
-if(NOT SHARED_V8)
-  if(V8_SNAPSHOT)
-    set(v8snapshot snapshot=on)
-  endif()
-  
-  if(${node_platform} MATCHES darwin)
-    execute_process(COMMAND hwprefs cpu_count OUTPUT_VARIABLE cpu_count)
-  elseif(${node_platform} MATCHES linux)
-    execute_process(COMMAND sh -c "cat /proc/cpuinfo | grep processor | sort | uniq | wc -l"
-      OUTPUT_VARIABLE cpu_count)
-  elseif(${node_platform} MATCHES sunos)
-    execute_process(COMMAND sh -c "psrinfo | wc -l" OUTPUT_VARIABLE cpu_count)
-  else()
-    set(cpu_count 1)
-  endif()
-
-  if(${cpu_count} GREATER 1)
-    math(EXPR parallel_jobs ${cpu_count}*2)
-  else()
-    set(parallel_jobs 1)
-  endif()
-
-  add_library(v8 STATIC IMPORTED)
-  set_property(TARGET v8
-    PROPERTY IMPORTED_LOCATION ${PROJECT_BINARY_DIR}/deps/v8/${v8_fn})
-
-  set(compile_env_vars  "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} CFLAGS=\"${CMAKE_C_FLAGS}\" CXXFLAGS=\"${CMAKE_CXX_FLAGS}\" LDFLAGS=\"${CMAKE_EXE_LINKER_FLAGS}\"")
-
-  if(CMAKE_VERSION VERSION_GREATER 2.8 OR CMAKE_VERSION VERSION_EQUAL 2.8)
-    # use ExternalProject for CMake >2.8
-    include(ExternalProject)
-    
-    ExternalProject_Add(v8_extprj
-      URL ${PROJECT_SOURCE_DIR}/deps/v8
-      
-      BUILD_IN_SOURCE True
-      BUILD_COMMAND sh -c "${compile_env_vars} ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/tools/scons/scons.py library=static visibility=default ${v8snapshot} mode=${v8mode} verbose=on arch=${v8arch} -j ${parallel_jobs}"
-      
-      SOURCE_DIR ${PROJECT_BINARY_DIR}/deps/v8
-      # ignore this stuff, it's not needed for building v8 but ExternalProject
-      # demands these steps
-      
-      CONFIGURE_COMMAND "true" # fake configure
-      INSTALL_COMMAND "true" # fake install
-      )
-    
-    add_dependencies(node v8_extprj)
-  else()
-    # copy v8 sources inefficiently with CMake versions <2.8
-    file(GLOB_RECURSE v8_sources RELATIVE ${PROJECT_SOURCE_DIR} deps/v8/*)
-    
-    if(NOT ${in_source_build})
-      file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/deps/v8)
-      
-      foreach(FILE ${v8_sources})
-        add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${FILE}
-          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/${FILE} ${PROJECT_BINARY_DIR}/${FILE}
-          DEPENDS ${PROJECT_SOURCE_DIR}/${FILE}
-          )
-        list(APPEND v8_sources_dest ${PROJECT_BINARY_DIR}/${FILE})
-      endforeach()
-    else()
-      set(v8_sources_dest ${v8_sources})
-    endif()
-
-    add_custom_command(
-      OUTPUT ${PROJECT_BINARY_DIR}/deps/v8/${v8_fn}
-      COMMAND sh -c "${compile_env_vars} ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/tools/scons/scons.py library=static visibility=default ${v8snapshot} mode=${v8mode} verbose=on arch=${v8arch} -j ${parallel_jobs}"
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/deps/v8/
-      DEPENDS ${v8_sources_dest}
-    )
-
-    add_custom_target(v8_stock ALL DEPENDS ${PROJECT_BINARY_DIR}/deps/v8/${v8_fn})
-    set_property(TARGET v8 PROPERTY
-      IMPORTED_LOCATION ${PROJECT_BINARY_DIR}/deps/v8/${v8_fn})
-    add_dependencies(node v8_stock)
-  endif()
-endif()
--- a/common.gypi
+++ b/common.gypi
@@ -0,0 +1,166 @@
+{
+  'variables': {
+    'visibility%': 'hidden',         # V8's visibility setting
+    'target_arch%': 'ia32',          # set v8's target architecture
+    'host_arch%': 'ia32',            # set v8's host architecture
+    '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
+  },
+
+  'target_defaults': {
+    'default_configuration': 'Debug',
+    'configurations': {
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'cflags': [ '-g', '-O0' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'target_conditions': [
+              ['library=="static_library"', {
+                'RuntimeLibrary': 1, # static debug
+              }, {
+                'RuntimeLibrary': 3, # DLL debug
+              }],
+            ],
+            'Optimization': 0, # /Od, no optimization
+            'MinimalRebuild': 'true',
+            'OmitFramePointers': 'false',
+            'BasicRuntimeChecks': 3, # /RTC1
+          },
+          'VCLinkerTool': {
+            'LinkIncremental': 2, # enable incremental linking
+          },
+        },
+      },
+      'Release': {
+        'defines': [ 'NDEBUG' ],
+        'cflags': [ '-O3', '-fomit-frame-pointer', '-fdata-sections', '-ffunction-sections' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'target_conditions': [
+              ['library=="static_library"', {
+                'RuntimeLibrary': 0, # static release
+              }, {
+                'RuntimeLibrary': 2, # debug release
+              }],
+            ],
+            'Optimization': 3, # /Ox, full optimization
+            'FavorSizeOrSpeed': 1, # /Ot, favour speed over size
+            'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible
+            'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG
+            'OmitFramePointers': 'true',
+            'EnableFunctionLevelLinking': 'true',
+            'EnableIntrinsicFunctions': 'true',
+            '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': {
+        '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',
+        ],
+      }],
+      [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        'cflags': [ '-Wall', '-pthread', ],
+        'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
+        'ldflags': [ '-pthread', ],
+        'conditions': [
+          [ 'target_arch=="ia32"', {
+            'cflags': [ '-m32' ],
+            'ldflags': [ '-m32' ],
+          }],
+          [ 'OS=="linux"', {
+            'cflags': [ '-ansi' ],
+          }],
+          [ 'visibility=="hidden"', {
+            'cflags': [ '-fvisibility=hidden' ],
+          }],
+        ],
+      }],
+      ['OS=="mac"', {
+        '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_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
+          'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
+          'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
+          'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
+          'GCC_VERSION': '4.2',
+          'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
+          'MACOSX_DEPLOYMENT_TARGET': '10.4',       # -mmacosx-version-min=10.4
+          'PREBINDING': 'NO',                       # No -Wl,-prebind
+          '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']},
+          }],
+        ],
+      }],
+    ],
+  }
+}
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,2 +0,0 @@
-#cmakedefine HAVE_OPENSSL 1
-#cmakedefine HAVE_CONFIG_H 1
--- a/2
+++ b/2
@@ -2,7 +2,7 @@

 # v8 doesn't like ccache
 if [ ! -z "`echo $CC | grep ccache`" ]; then
-  echo "Error: V8 doesn't like cache. Please set your CC env var to 'gcc'"
+  echo "Error: V8 doesn't like ccache. Please set your CC env var to 'gcc'"
  echo "  (ba)sh: export CC=gcc"
  exit 1
 fi
--- a/247
+++ b/247
@@ -0,0 +1,247 @@
+#!/usr/bin/env python
+
+import optparse
+import os
+import json
+import sys
+
+root_dir = os.path.dirname(__file__)
+sys.path.insert(0, os.path.join(root_dir, 'deps', 'v8', 'tools'))
+import utils # GuessArchitecture
+
+# parse our options
+parser = optparse.OptionParser()
+
+parser.add_option("--debug",
+    action="store_true",
+    dest="debug",
+    help="Also build debug build")
+
+parser.add_option("--prefix",
+    action="store",
+    dest="prefix",
+    help="Select the install prefix (defaults to /usr/local)")
+
+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("--openssl-includes",
+    action="store",
+    dest="openssl_includes",
+    help="A directory to search for the OpenSSL includes")
+
+parser.add_option("--openssl-libpath",
+    action="store",
+    dest="openssl_libpath",
+    help="A directory to search for the OpenSSL libraries")
+
+parser.add_option("--no-ssl2",
+    action="store_true",
+    dest="no_ssl2",
+    help="Disable OpenSSL v2")
+
+parser.add_option("--shared-cares",
+    action="store_true",
+    dest="shared_cares",
+    help="Link to a shared C-Ares DLL instead of static linking")
+
+parser.add_option("--shared-cares-includes",
+    action="store",
+    dest="shared_cares_includes",
+    help="Directory containing C-Ares header files")
+
+parser.add_option("--shared-cares-libpath",
+    action="store",
+    dest="shared_cares_libpath",
+    help="A directory to search for the shared C-Ares DLL")
+
+parser.add_option("--with-dtrace",
+    action="store_true",
+    dest="with_dtrace",
+    help="Build with DTrace (experimental)")
+
+# 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")
+
+(options, args) = parser.parse_args()
+
+
+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 uname(switch):
+  f = os.popen('uname %s' % switch)
+  s = f.read().strip()
+  f.close()
+  return s
+
+
+def host_arch():
+  """Host architecture. One of arm, ia32 or x64."""
+  arch = uname('-p')
+
+  if arch == 'unknown':
+    arch = uname('-m')
+
+  return {
+    'arm': 'arm',
+    'x86': 'ia32',
+    'i386': 'ia32',
+    'x86_64': 'x64',
+  }.get(arch, 'ia32')
+
+
+def target_arch():
+  # TODO act on options.dest_cpu
+  return host_arch()
+
+
+def configure_node(o):
+  # TODO add gdb and dest_cpu
+  o['variables']['node_debug'] = 'true' if options.debug else 'false'
+  o['variables']['node_prefix'] = options.prefix if options.prefix else ''
+  o['variables']['node_use_dtrace'] = 'true' if options.with_dtrace else 'false'
+  o['variables']['host_arch'] = host_arch()
+  o['variables']['target_arch'] = target_arch()
+
+  # TODO move to node.gyp
+  if sys.platform == 'sunos5':
+    o['variables']['visibility'] = '' # FIXME -fvisibility=hidden, should be a gcc check
+
+
+def configure_libz(o):
+  o['libraries'] += ['-lz']
+
+
+def configure_v8(o):
+  o['variables']['v8_use_snapshot'] = 'true' if not options.without_snapshot else 'false'
+  o['variables']['node_shared_v8'] = 'true' if options.shared_v8 else 'false'
+
+  # 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]
+  if options.shared_v8_includes:
+    o['include_dirs'] += [options.shared_v8_includes]
+
+
+def configure_cares(o):
+  o['variables']['node_shared_cares'] = 'true' if options.shared_cares else 'false'
+
+  # assume shared_cares if one of these is set?
+  if options.shared_cares_libpath:
+    o['libraries'] += ['-L%s' % options.shared_cares_libpath]
+  if options.shared_cares_includes:
+    o['include_dirs'] += [options.shared_cares_includes]
+
+
+def configure_openssl(o):
+  o['variables']['node_use_openssl'] = 'false' if options.without_ssl else 'true'
+
+  if options.without_ssl:
+    return
+
+  if options.no_ssl2:
+    o['defines'] += ['OPENSSL_NO_SSL2=1']
+
+  out = pkg_config('openssl')
+  (libs, cflags) = out if out else ('', '')
+
+  if options.openssl_libpath:
+    o['libraries'] += ['-L%s' % options.openssl_libpath, '-lssl', '-lcrypto']
+  else:
+    o['libraries'] += libs.split()
+
+  if options.openssl_includes:
+    o['include_dirs'] += [options.openssl_includes]
+  else:
+    o['cflags'] += cflags.split()
+
+  if libs or cflags or options.openssl_libpath or options.openssl_includes:
+    o['variables']['node_use_system_openssl'] = 'true'
+  else:
+    o['variables']['node_use_system_openssl'] = 'false'
+
+
+print "configure options:", options
+
+output = {
+  'variables': {},
+  'include_dirs': [],
+  'libraries': [],
+  'defines': [],
+  'cflags': [],
+}
+
+configure_node(output)
+configure_libz(output)
+configure_v8(output)
+configure_cares(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
+}
+
+fn = os.path.join(root_dir, 'options.gypi')
+print "creating ", fn
+
+f = open(fn, 'w+')
+f.write("# Do not edit. Generated by the configure script.\n")
+json.dump(output, f, indent=2, skipkeys=True)
+f.write("\n")
+f.close()
+
--- a/deps/c-ares/RELEASE-NOTES
+++ b/deps/c-ares/RELEASE-NOTES
@@ -1,25 +0,0 @@
-c-ares version 1.7.4
-
-Changed:
-
- o local-bind: Support binding to local interface/IPs, see
-   ares_set_local_ip4, ares_set_local_ip6, ares_set_local_dev
-
-Fixed:
-
- o memory leak in ares_getnameinfo
- o add missing break that caused get_ares_servers to fail
- o ares_parse_a_reply: fix CNAME response parsing
- o init_by_options: don't copy an empty sortlist
- o Replaced uint32_t with unsigned int to fix broken builds
-   on a couple of platforms
- o Fix lookup with HOSTALIASES set
- o adig: fix NAPTR parsing
- o compiler warning cleanups
-
-Thanks go to these friendly people for their efforts and contributions:
-
- Andrew C. Morrow, Ben Greear, Ben Noordhuis, Daniel Stenberg,
- Guenter Knauf, Mike Crowe, Patrik Thunstrom, Yang Tse
-
-Have fun!
--- a/deps/c-ares/ares_nowarn.c
+++ b/deps/c-ares/ares_nowarn.c
@@ -1,70 +0,0 @@
-
-/* Copyright (C) 2010 by Daniel Stenberg
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-
-#include "ares_setup.h"
-
-#include "ares_nowarn.h"
-
-#if (SIZEOF_INT == 2)
-#  define CARES_MASK_SINT  0x7FFF
-#  define CARES_MASK_UINT  0xFFFF
-#elif (SIZEOF_INT == 4)
-#  define CARES_MASK_SINT  0x7FFFFFFF
-#  define CARES_MASK_UINT  0xFFFFFFFF
-#elif (SIZEOF_INT == 8)
-#  define CARES_MASK_SINT  0x7FFFFFFFFFFFFFFF
-#  define CARES_MASK_UINT  0xFFFFFFFFFFFFFFFF
-#elif (SIZEOF_INT == 16)
-#  define CARES_MASK_SINT  0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-#  define CARES_MASK_UINT  0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-#endif
-
-/*
-** size_t to signed int
-*/
-
-int aresx_uztosi(size_t uznum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  return (int)(uznum & (size_t) CARES_MASK_SINT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
-
-/*
-** signed long to signed int
-*/
-
-int aresx_sltosi(long slnum)
-{
-#ifdef __INTEL_COMPILER
-#  pragma warning(push)
-#  pragma warning(disable:810) /* conversion may lose significant bits */
-#endif
-
-  return (int)(slnum & (long) CARES_MASK_SINT);
-
-#ifdef __INTEL_COMPILER
-#  pragma warning(pop)
-#endif
-}
--- a/deps/c-ares/cygwin-ia32/ares_build.h
+++ b/deps/c-ares/cygwin-ia32/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/cygwin-ia32/ares_setup.h
+++ b/deps/c-ares/cygwin-ia32/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/darwin-ia32/ares_build.h
+++ b/deps/c-ares/darwin-ia32/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/darwin-x64/ares_build.h
+++ b/deps/c-ares/darwin-x64/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 8
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/darwin-x64/ares_config.h
+++ b/deps/c-ares/darwin-x64/ares_config.h
@@ -1,513 +0,0 @@
-/* ares_config.h.  Generated from ares_config.h.in by configure.  */
-/* ares_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* define this if ares is built for a big endian system */
-/* #undef ARES_BIG_ENDIAN */
-
-/* when building as static part of libcurl */
-/* #undef BUILDING_LIBCURL */
-
-/* when building c-ares library */
-/* #undef CARES_BUILDING_LIBRARY */
-
-/* when not building a shared library */
-/* #undef CARES_STATICLIB */
-
-/* Define to 1 to enable hiding of library internal symbols. */
-#define CARES_SYMBOL_HIDING 1
-
-/* Definition to make a library symbol externally visible. */
-#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
-
-/* if a /etc/inet dir is being used */
-/* #undef ETC_INET */
-
-/* Define to the type qualifier of arg 1 for getnameinfo. */
-#define GETNAMEINFO_QUAL_ARG1 const
-
-/* Define to the type of arg 1 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-
-/* Define to the type of arg 2 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-
-/* Define to the type of args 4 and 6 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG46 socklen_t
-
-/* Define to the type of arg 7 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG7 int
-
-/* Specifies the number of arguments to getservbyport_r */
-/* #undef GETSERVBYPORT_R_ARGS */
-
-/* Specifies the size of the buffer to pass to getservbyport_r */
-/* #undef GETSERVBYPORT_R_BUFSIZE */
-
-/* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#define HAVE_ARPA_NAMESER_COMPAT_H 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `bitncmp' function. */
-/* #undef HAVE_BITNCMP */
-
-/* Define to 1 if bool is an available type. */
-#define HAVE_BOOL_T 1
-
-/* Define to 1 if you have the clock_gettime function and monotonic timer. */
-/* #undef HAVE_CLOCK_GETTIME_MONOTONIC */
-
-/* Define to 1 if you have the closesocket function. */
-/* #undef HAVE_CLOSESOCKET */
-
-/* Define to 1 if you have the CloseSocket camel case function. */
-/* #undef HAVE_CLOSESOCKET_CAMEL */
-
-/* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the fcntl function. */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#define HAVE_FCNTL_O_NONBLOCK 1
-
-/* Define to 1 if you have the freeaddrinfo function. */
-#define HAVE_FREEADDRINFO 1
-
-/* Define to 1 if you have a working getaddrinfo function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if the getaddrinfo function is threadsafe. */
-#define HAVE_GETADDRINFO_THREADSAFE 1
-
-/* Define to 1 if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
-
-/* Define to 1 if you have the gethostbyname function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the getservbyport_r function. */
-/* #undef HAVE_GETSERVBYPORT_R */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_net_pton' function. */
-#define HAVE_INET_NET_PTON 1
-
-/* Define to 1 if inet_net_pton supports IPv6. */
-#define HAVE_INET_NET_PTON_IPV6 1
-
-/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#define HAVE_INET_PTON 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the ioctl function. */
-#define HAVE_IOCTL 1
-
-/* Define to 1 if you have the ioctlsocket function. */
-/* #undef HAVE_IOCTLSOCKET */
-
-/* Define to 1 if you have the IoctlSocket camel case function. */
-/* #undef HAVE_IOCTLSOCKET_CAMEL */
-
-/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
-   */
-/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
-
-/* Define to 1 if you have a working ioctlsocket FIONBIO function. */
-/* #undef HAVE_IOCTLSOCKET_FIONBIO */
-
-/* Define to 1 if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO 1
-
-/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#define HAVE_IOCTL_SIOCGIFADDR 1
-
-/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* if your compiler supports LL */
-#define HAVE_LL 1
-
-/* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG 1
-
-/* Define to 1 if you have the malloc.h header file. */
-/* #undef HAVE_MALLOC_H */
-
-/* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the MSG_NOSIGNAL flag. */
-/* #undef HAVE_MSG_NOSIGNAL */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
-
-/* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6 1
-
-/* Define to 1 if you have the recv function. */
-#define HAVE_RECV 1
-
-/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
-
-/* Define to 1 if you have the send function. */
-#define HAVE_SEND 1
-
-/* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT 1
-
-/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
-/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if sig_atomic_t is an available typedef. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if sig_atomic_t is already defined as volatile. */
-/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
-
-/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <socket.h> header file. */
-/* #undef HAVE_SOCKET_H */
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the strcmpi function. */
-/* #undef HAVE_STRCMPI */
-
-/* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the stricmp function. */
-/* #undef HAVE_STRICMP */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the strncmpi function. */
-/* #undef HAVE_STRNCMPI */
-
-/* Define to 1 if you have the strnicmp function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the <stropts.h> header file. */
-/* #undef HAVE_STROPTS_H */
-
-/* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the windows.h header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if you have the winsock2.h header file. */
-/* #undef HAVE_WINSOCK2_H */
-
-/* Define to 1 if you have the winsock.h header file. */
-/* #undef HAVE_WINSOCK_H */
-
-/* Define to 1 if you have the writev function. */
-#define HAVE_WRITEV 1
-
-/* Define to 1 if you have the ws2tcpip.h header file. */
-/* #undef HAVE_WS2TCPIP_H */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #undef NEED_MALLOC_H */
-
-/* Define to 1 if you need the memory.h header file even with stdlib.h */
-/* #undef NEED_MEMORY_H */
-
-/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
-/* #undef NEED_REENTRANT */
-
-/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
-/* #undef NEED_THREAD_SAFE */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* cpu-machine-OS */
-#define OS "x86_64-apple-darwin10.3.0"
-
-/* Name of package */
-#define PACKAGE "c-ares"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "c-ares"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "c-ares 1.7.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "c-ares"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.1"
-
-/* a suitable file/device to read random data from */
-#define RANDOM_FILE "/dev/urandom"
-
-/* Define to the type of arg 1 for recvfrom. */
-#define RECVFROM_TYPE_ARG1 int
-
-/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 void
-
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
-
-/* Define to the type of arg 3 for recvfrom. */
-#define RECVFROM_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recvfrom. */
-#define RECVFROM_TYPE_ARG4 int
-
-/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
-
-/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-
-/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 socklen_t
-
-/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
-
-/* Define to the function return type for recvfrom. */
-#define RECVFROM_TYPE_RETV ssize_t
-
-/* Define to the type of arg 1 for recv. */
-#define RECV_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for recv. */
-#define RECV_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for recv. */
-#define RECV_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recv. */
-#define RECV_TYPE_ARG4 int
-
-/* Define to the function return type for recv. */
-#define RECV_TYPE_RETV ssize_t
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
-
-/* Define to the type of arg 1 for send. */
-#define SEND_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for send. */
-#define SEND_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for send. */
-#define SEND_TYPE_ARG4 int
-
-/* Define to the function return type for send. */
-#define SEND_TYPE_RETV ssize_t
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 8
-
-/* The size of `struct in6_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN6_ADDR 16
-
-/* The size of `struct in_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN_ADDR 4
-
-/* The size of `time_t', as computed by sizeof. */
-#define SIZEOF_TIME_T 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to disable non-blocking sockets. */
-/* #undef USE_BLOCKING_SOCKETS */
-
-/* Version number of package */
-#define VERSION "1.7.1"
-
-/* Define to avoid automatic inclusion of winsock.h */
-/* #undef WIN32_LEAN_AND_MEAN */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if OS is AIX. */
-#ifndef _ALL_SOURCE
-/* #  undef _ALL_SOURCE */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Type to use in place of in_addr_t when system does not provide it. */
-/* #undef in_addr_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* the signed version of size_t */
-/* #undef ssize_t */
--- a/deps/c-ares/darwin-x64/ares_setup.h
+++ b/deps/c-ares/darwin-x64/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/freebsd-ia32/ares_build.h
+++ b/deps/c-ares/freebsd-ia32/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/freebsd-ia32/ares_setup.h
+++ b/deps/c-ares/freebsd-ia32/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/freebsd-x64/ares_build.h
+++ b/deps/c-ares/freebsd-x64/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 8
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/freebsd-x64/ares_config.h
+++ b/deps/c-ares/freebsd-x64/ares_config.h
@@ -1,513 +0,0 @@
-/* ares_config.h.  Generated from ares_config.h.in by configure.  */
-/* ares_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* define this if ares is built for a big endian system */
-/* #undef ARES_BIG_ENDIAN */
-
-/* when building as static part of libcurl */
-/* #undef BUILDING_LIBCURL */
-
-/* when building c-ares library */
-/* #undef CARES_BUILDING_LIBRARY */
-
-/* when not building a shared library */
-/* #undef CARES_STATICLIB */
-
-/* Define to 1 to enable hiding of library internal symbols. */
-#define CARES_SYMBOL_HIDING 1
-
-/* Definition to make a library symbol externally visible. */
-#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
-
-/* if a /etc/inet dir is being used */
-/* #undef ETC_INET */
-
-/* Define to the type qualifier of arg 1 for getnameinfo. */
-#define GETNAMEINFO_QUAL_ARG1 const
-
-/* Define to the type of arg 1 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-
-/* Define to the type of arg 2 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-
-/* Define to the type of args 4 and 6 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG46 size_t
-
-/* Define to the type of arg 7 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG7 int
-
-/* Specifies the number of arguments to getservbyport_r */
-#define GETSERVBYPORT_R_ARGS 6
-
-/* Specifies the size of the buffer to pass to getservbyport_r */
-#define GETSERVBYPORT_R_BUFSIZE 4096
-
-/* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#define HAVE_ARPA_NAMESER_COMPAT_H 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `bitncmp' function. */
-/* #undef HAVE_BITNCMP */
-
-/* Define to 1 if bool is an available type. */
-#define HAVE_BOOL_T 1
-
-/* Define to 1 if you have the clock_gettime function and monotonic timer. */
-#define HAVE_CLOCK_GETTIME_MONOTONIC 1
-
-/* Define to 1 if you have the closesocket function. */
-/* #undef HAVE_CLOSESOCKET */
-
-/* Define to 1 if you have the CloseSocket camel case function. */
-/* #undef HAVE_CLOSESOCKET_CAMEL */
-
-/* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the fcntl function. */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#define HAVE_FCNTL_O_NONBLOCK 1
-
-/* Define to 1 if you have the freeaddrinfo function. */
-#define HAVE_FREEADDRINFO 1
-
-/* Define to 1 if you have a working getaddrinfo function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if the getaddrinfo function is threadsafe. */
-#define HAVE_GETADDRINFO_THREADSAFE 1
-
-/* Define to 1 if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
-
-/* Define to 1 if you have the gethostbyname function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the getservbyport_r function. */
-#define HAVE_GETSERVBYPORT_R 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_net_pton' function. */
-#define HAVE_INET_NET_PTON 1
-
-/* Define to 1 if inet_net_pton supports IPv6. */
-/* #undef HAVE_INET_NET_PTON_IPV6 */
-
-/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#define HAVE_INET_PTON 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the ioctl function. */
-#define HAVE_IOCTL 1
-
-/* Define to 1 if you have the ioctlsocket function. */
-/* #undef HAVE_IOCTLSOCKET */
-
-/* Define to 1 if you have the IoctlSocket camel case function. */
-/* #undef HAVE_IOCTLSOCKET_CAMEL */
-
-/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
-   */
-/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
-
-/* Define to 1 if you have a working ioctlsocket FIONBIO function. */
-/* #undef HAVE_IOCTLSOCKET_FIONBIO */
-
-/* Define to 1 if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO 1
-
-/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#define HAVE_IOCTL_SIOCGIFADDR 1
-
-/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* if your compiler supports LL */
-#define HAVE_LL 1
-
-/* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG 1
-
-/* Define to 1 if you have the malloc.h header file. */
-/* #undef HAVE_MALLOC_H */
-
-/* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the MSG_NOSIGNAL flag. */
-#define HAVE_MSG_NOSIGNAL 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
-
-/* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6 1
-
-/* Define to 1 if you have the recv function. */
-#define HAVE_RECV 1
-
-/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
-
-/* Define to 1 if you have the send function. */
-#define HAVE_SEND 1
-
-/* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT 1
-
-/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
-/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if sig_atomic_t is an available typedef. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if sig_atomic_t is already defined as volatile. */
-/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
-
-/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <socket.h> header file. */
-/* #undef HAVE_SOCKET_H */
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the strcmpi function. */
-/* #undef HAVE_STRCMPI */
-
-/* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the stricmp function. */
-/* #undef HAVE_STRICMP */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the strncmpi function. */
-/* #undef HAVE_STRNCMPI */
-
-/* Define to 1 if you have the strnicmp function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the <stropts.h> header file. */
-/* #undef HAVE_STROPTS_H */
-
-/* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the windows.h header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if you have the winsock2.h header file. */
-/* #undef HAVE_WINSOCK2_H */
-
-/* Define to 1 if you have the winsock.h header file. */
-/* #undef HAVE_WINSOCK_H */
-
-/* Define to 1 if you have the writev function. */
-#define HAVE_WRITEV 1
-
-/* Define to 1 if you have the ws2tcpip.h header file. */
-/* #undef HAVE_WS2TCPIP_H */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #undef NEED_MALLOC_H */
-
-/* Define to 1 if you need the memory.h header file even with stdlib.h */
-/* #undef NEED_MEMORY_H */
-
-/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
-/* #undef NEED_REENTRANT */
-
-/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
-/* #undef NEED_THREAD_SAFE */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* cpu-machine-OS */
-#define OS "amd64-portbld-freebsd8.0"
-
-/* Name of package */
-#define PACKAGE "c-ares"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "c-ares"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "c-ares 1.7.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "c-ares"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.1"
-
-/* a suitable file/device to read random data from */
-#define RANDOM_FILE "/dev/urandom"
-
-/* Define to the type of arg 1 for recvfrom. */
-#define RECVFROM_TYPE_ARG1 int
-
-/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 void
-
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
-
-/* Define to the type of arg 3 for recvfrom. */
-#define RECVFROM_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recvfrom. */
-#define RECVFROM_TYPE_ARG4 int
-
-/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
-
-/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-
-/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 socklen_t
-
-/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
-
-/* Define to the function return type for recvfrom. */
-#define RECVFROM_TYPE_RETV ssize_t
-
-/* Define to the type of arg 1 for recv. */
-#define RECV_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for recv. */
-#define RECV_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for recv. */
-#define RECV_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recv. */
-#define RECV_TYPE_ARG4 int
-
-/* Define to the function return type for recv. */
-#define RECV_TYPE_RETV ssize_t
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
-
-/* Define to the type of arg 1 for send. */
-#define SEND_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for send. */
-#define SEND_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for send. */
-#define SEND_TYPE_ARG4 int
-
-/* Define to the function return type for send. */
-#define SEND_TYPE_RETV ssize_t
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 8
-
-/* The size of `struct in6_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN6_ADDR 16
-
-/* The size of `struct in_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN_ADDR 4
-
-/* The size of `time_t', as computed by sizeof. */
-#define SIZEOF_TIME_T 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to disable non-blocking sockets. */
-/* #undef USE_BLOCKING_SOCKETS */
-
-/* Version number of package */
-#define VERSION "1.7.1"
-
-/* Define to avoid automatic inclusion of winsock.h */
-/* #undef WIN32_LEAN_AND_MEAN */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if OS is AIX. */
-#ifndef _ALL_SOURCE
-/* #  undef _ALL_SOURCE */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Type to use in place of in_addr_t when system does not provide it. */
-/* #undef in_addr_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* the signed version of size_t */
-/* #undef ssize_t */
--- a/deps/c-ares/freebsd-x64/ares_setup.h
+++ b/deps/c-ares/freebsd-x64/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/inet_ntop.c
+++ b/deps/c-ares/inet_ntop.c
@@ -1,232 +0,0 @@
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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.
- */
-
-#include "ares_setup.h"
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#  include <arpa/nameser.h>
-#else
-#  include "nameser.h"
-#endif
-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#  include <arpa/nameser_compat.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "ares.h"
-#include "ares_ipv6.h"
-#include "inet_ntop.h"
-
-
-#ifndef HAVE_INET_NTOP
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size);
-static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *     convert a network format address to presentation format.
- * return:
- *     pointer to presentation format address (`dst'), or NULL (see errno).
- * note:
- *      On Windows we store the error in the thread errno, not
- *      in the winsock error code. This is to avoid loosing the
- *      actual last winsock error. So use macro ERRNO to fetch the
- *      errno this funtion sets when returning NULL, not SOCKERRNO.
- * author:
- *     Paul Vixie, 1996.
- */
-const char *
-ares_inet_ntop(int af, const void *src, char *dst, size_t size)
-{
-  switch (af)
-    {
-    case AF_INET:
-      return (inet_ntop4(src, dst, size));
-    case AF_INET6:
-      return (inet_ntop6(src, dst, size));
-    default:
-      SET_ERRNO(EAFNOSUPPORT);
-      return (NULL);
-    }
-  /* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *     format an IPv4 address, more or less like inet_ntoa()
- * return:
- *     `dst' (as a const)
- * notes:
- *     (1) uses no statics
- *     (2) takes a unsigned char* not an in_addr as input
- * author:
- *     Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const unsigned char *src, char *dst, size_t size)
-{
-  static const char fmt[] = "%u.%u.%u.%u";
-  char tmp[sizeof "255.255.255.255"];
-
-  if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size)
-    {
-      SET_ERRNO(ENOSPC);
-      return (NULL);
-    }
-    strcpy(dst, tmp);
-    return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *    convert IPv6 binary address into presentation (printable) format
- * author:
- *    Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(const unsigned char *src, char *dst, size_t size)
-{
-  /*
-   * Note that int32_t and int16_t need only be "at least" large enough
-   * to contain a value of the specified size.  On some systems, like
-   * Crays, there is no such thing as an integer variable with 16 bits.
-   * Keep this in mind if you think this function should have been coded
-   * to use pointer overlays.  All the world's not a VAX.
-   */
-  char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
-  char *tp;
-  struct {
-    long base;
-    long len;
-  } best, cur;
-  unsigned long words[NS_IN6ADDRSZ / NS_INT16SZ];
-  int i;
-
-  /*
-   * Preprocess:
-   *  Copy the input (bytewise) array into a wordwise array.
-   *  Find the longest run of 0x00's in src[] for :: shorthanding.
-   */
-  memset(words, '\0', sizeof(words));
-  for (i = 0; i < NS_IN6ADDRSZ; i++)
-      words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-
-  best.base = -1;
-  cur.base = -1;
-  best.len = 0;
-  cur.len = 0;
-
-  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
-    {
-      if (words[i] == 0)
-        {
-          if (cur.base == -1)
-            cur.base = i, cur.len = 1;
-          else
-            cur.len++;
-        }
-      else
-        {
-          if (cur.base != -1)
-            {
-              if (best.base == -1 || cur.len > best.len)
-                best = cur;
-              cur.base = -1;
-            }
-        }
-    }
-  if (cur.base != -1)
-    {
-      if (best.base == -1 || cur.len > best.len)
-        best = cur;
-    }
-  if (best.base != -1 && best.len < 2)
-    best.base = -1;
-
-  /*
-   * Format the result.
-   */
-  tp = tmp;
-  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
-    {
-      /* Are we inside the best run of 0x00's? */
-      if (best.base != -1 && i >= best.base &&
-          i < (best.base + best.len))
-        {
-          if (i == best.base)
-             *tp++ = ':';
-          continue;
-        }
-      /* Are we following an initial run of 0x00s or any real hex? */
-      if (i != 0)
-        *tp++ = ':';
-      /* Is this address an encapsulated IPv4? */
-      if (i == 6 && best.base == 0 &&
-          (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
-        {
-          if (!inet_ntop4(src+12, tp, sizeof(tmp) - (tp - tmp)))
-            return (NULL);
-          tp += strlen(tp);
-          break;
-        }
-        tp += SPRINTF((tp, "%lx", words[i]));
-    }
-
-  /* Was it a trailing run of 0x00's? */
-  if (best.base != -1 && (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ))
-    *tp++ = ':';
-  *tp++ = '\0';
-
-  /*
-   * Check for overflow, copy, and we're done.
-   */
-  if ((size_t)(tp - tmp) > size)
-    {
-      SET_ERRNO(ENOSPC);
-      return (NULL);
-    }
-  strcpy(dst, tmp);
-  return (dst);
-}
-#endif
-
--- a/deps/c-ares/linux-arm/ares_build.h
+++ b/deps/c-ares/linux-arm/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/linux-arm/ares_config.h
+++ b/deps/c-ares/linux-arm/ares_config.h
@@ -1,513 +0,0 @@
-/* ares_config.h.  Generated from ares_config.h.in by configure.  */
-/* ares_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* define this if ares is built for a big endian system */
-/* #undef ARES_BIG_ENDIAN */
-
-/* when building as static part of libcurl */
-/* #undef BUILDING_LIBCURL */
-
-/* when building c-ares library */
-/* #undef CARES_BUILDING_LIBRARY */
-
-/* when not building a shared library */
-/* #undef CARES_STATICLIB */
-
-/* Define to 1 to enable hiding of library internal symbols. */
-#define CARES_SYMBOL_HIDING 1
-
-/* Definition to make a library symbol externally visible. */
-#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
-
-/* if a /etc/inet dir is being used */
-/* #undef ETC_INET */
-
-/* Define to the type qualifier of arg 1 for getnameinfo. */
-#define GETNAMEINFO_QUAL_ARG1 const
-
-/* Define to the type of arg 1 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-
-/* Define to the type of arg 2 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-
-/* Define to the type of args 4 and 6 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG46 size_t
-
-/* Define to the type of arg 7 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG7 unsigned int
-
-/* Specifies the number of arguments to getservbyport_r */
-#define GETSERVBYPORT_R_ARGS 6
-
-/* Specifies the size of the buffer to pass to getservbyport_r */
-#define GETSERVBYPORT_R_BUFSIZE 4096
-
-/* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#define HAVE_ARPA_NAMESER_COMPAT_H 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `bitncmp' function. */
-/* #undef HAVE_BITNCMP */
-
-/* Define to 1 if bool is an available type. */
-#define HAVE_BOOL_T 1
-
-/* Define to 1 if you have the clock_gettime function and monotonic timer. */
-#define HAVE_CLOCK_GETTIME_MONOTONIC 1
-
-/* Define to 1 if you have the closesocket function. */
-/* #undef HAVE_CLOSESOCKET */
-
-/* Define to 1 if you have the CloseSocket camel case function. */
-/* #undef HAVE_CLOSESOCKET_CAMEL */
-
-/* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the fcntl function. */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#define HAVE_FCNTL_O_NONBLOCK 1
-
-/* Define to 1 if you have the freeaddrinfo function. */
-#define HAVE_FREEADDRINFO 1
-
-/* Define to 1 if you have a working getaddrinfo function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if the getaddrinfo function is threadsafe. */
-#define HAVE_GETADDRINFO_THREADSAFE 1
-
-/* Define to 1 if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
-
-/* Define to 1 if you have the gethostbyname function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the getservbyport_r function. */
-#define HAVE_GETSERVBYPORT_R 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_net_pton' function. */
-/* #undef HAVE_INET_NET_PTON */
-
-/* Define to 1 if inet_net_pton supports IPv6. */
-/* #undef HAVE_INET_NET_PTON_IPV6 */
-
-/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#define HAVE_INET_PTON 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the ioctl function. */
-#define HAVE_IOCTL 1
-
-/* Define to 1 if you have the ioctlsocket function. */
-/* #undef HAVE_IOCTLSOCKET */
-
-/* Define to 1 if you have the IoctlSocket camel case function. */
-/* #undef HAVE_IOCTLSOCKET_CAMEL */
-
-/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
-   */
-/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
-
-/* Define to 1 if you have a working ioctlsocket FIONBIO function. */
-/* #undef HAVE_IOCTLSOCKET_FIONBIO */
-
-/* Define to 1 if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO 1
-
-/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#define HAVE_IOCTL_SIOCGIFADDR 1
-
-/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* if your compiler supports LL */
-#define HAVE_LL 1
-
-/* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG 1
-
-/* Define to 1 if you have the malloc.h header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the MSG_NOSIGNAL flag. */
-#define HAVE_MSG_NOSIGNAL 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
-
-/* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6 1
-
-/* Define to 1 if you have the recv function. */
-#define HAVE_RECV 1
-
-/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
-
-/* Define to 1 if you have the send function. */
-#define HAVE_SEND 1
-
-/* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT 1
-
-/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
-/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if sig_atomic_t is an available typedef. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if sig_atomic_t is already defined as volatile. */
-/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
-
-/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <socket.h> header file. */
-/* #undef HAVE_SOCKET_H */
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the strcmpi function. */
-/* #undef HAVE_STRCMPI */
-
-/* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the stricmp function. */
-/* #undef HAVE_STRICMP */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the strncmpi function. */
-/* #undef HAVE_STRNCMPI */
-
-/* Define to 1 if you have the strnicmp function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the <stropts.h> header file. */
-#define HAVE_STROPTS_H 1
-
-/* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the windows.h header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if you have the winsock2.h header file. */
-/* #undef HAVE_WINSOCK2_H */
-
-/* Define to 1 if you have the winsock.h header file. */
-/* #undef HAVE_WINSOCK_H */
-
-/* Define to 1 if you have the writev function. */
-#define HAVE_WRITEV 1
-
-/* Define to 1 if you have the ws2tcpip.h header file. */
-/* #undef HAVE_WS2TCPIP_H */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #undef NEED_MALLOC_H */
-
-/* Define to 1 if you need the memory.h header file even with stdlib.h */
-/* #undef NEED_MEMORY_H */
-
-/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
-/* #undef NEED_REENTRANT */
-
-/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
-/* #undef NEED_THREAD_SAFE */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* cpu-machine-OS */
-#define OS "armv5tel-unknown-linux-gnueabi"
-
-/* Name of package */
-#define PACKAGE "c-ares"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "c-ares"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "c-ares 1.7.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "c-ares"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.1"
-
-/* a suitable file/device to read random data from */
-#define RANDOM_FILE "/dev/urandom"
-
-/* Define to the type of arg 1 for recvfrom. */
-#define RECVFROM_TYPE_ARG1 int
-
-/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 void
-
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
-
-/* Define to the type of arg 3 for recvfrom. */
-#define RECVFROM_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recvfrom. */
-#define RECVFROM_TYPE_ARG4 int
-
-/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
-
-/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-
-/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 socklen_t
-
-/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
-
-/* Define to the function return type for recvfrom. */
-#define RECVFROM_TYPE_RETV int
-
-/* Define to the type of arg 1 for recv. */
-#define RECV_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for recv. */
-#define RECV_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for recv. */
-#define RECV_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recv. */
-#define RECV_TYPE_ARG4 int
-
-/* Define to the function return type for recv. */
-#define RECV_TYPE_RETV int
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
-
-/* Define to the type of arg 1 for send. */
-#define SEND_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for send. */
-#define SEND_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for send. */
-#define SEND_TYPE_ARG4 int
-
-/* Define to the function return type for send. */
-#define SEND_TYPE_RETV int
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
-
-/* The size of `struct in6_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN6_ADDR 16
-
-/* The size of `struct in_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN_ADDR 4
-
-/* The size of `time_t', as computed by sizeof. */
-#define SIZEOF_TIME_T 4
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to disable non-blocking sockets. */
-/* #undef USE_BLOCKING_SOCKETS */
-
-/* Version number of package */
-#define VERSION "1.7.1"
-
-/* Define to avoid automatic inclusion of winsock.h */
-/* #undef WIN32_LEAN_AND_MEAN */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if OS is AIX. */
-#ifndef _ALL_SOURCE
-/* #  undef _ALL_SOURCE */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Type to use in place of in_addr_t when system does not provide it. */
-/* #undef in_addr_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* the signed version of size_t */
-/* #undef ssize_t */
--- a/deps/c-ares/linux-arm/ares_setup.h
+++ b/deps/c-ares/linux-arm/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/linux-ia32/ares_build.h
+++ b/deps/c-ares/linux-ia32/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/linux-ia32/ares_setup.h
+++ b/deps/c-ares/linux-ia32/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/linux-x64/ares_build.h
+++ b/deps/c-ares/linux-x64/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 8
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/linux-x64/ares_config.h
+++ b/deps/c-ares/linux-x64/ares_config.h
@@ -1,513 +0,0 @@
-/* ares_config.h.  Generated from ares_config.h.in by configure.  */
-/* ares_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* define this if ares is built for a big endian system */
-/* #undef ARES_BIG_ENDIAN */
-
-/* when building as static part of libcurl */
-/* #undef BUILDING_LIBCURL */
-
-/* when building c-ares library */
-/* #undef CARES_BUILDING_LIBRARY */
-
-/* when not building a shared library */
-/* #undef CARES_STATICLIB */
-
-/* Define to 1 to enable hiding of library internal symbols. */
-#define CARES_SYMBOL_HIDING 1
-
-/* Definition to make a library symbol externally visible. */
-#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
-
-/* if a /etc/inet dir is being used */
-/* #undef ETC_INET */
-
-/* Define to the type qualifier of arg 1 for getnameinfo. */
-#define GETNAMEINFO_QUAL_ARG1 const
-
-/* Define to the type of arg 1 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-
-/* Define to the type of arg 2 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-
-/* Define to the type of args 4 and 6 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG46 socklen_t
-
-/* Define to the type of arg 7 for getnameinfo. */
-#define GETNAMEINFO_TYPE_ARG7 unsigned int
-
-/* Specifies the number of arguments to getservbyport_r */
-#define GETSERVBYPORT_R_ARGS 6
-
-/* Specifies the size of the buffer to pass to getservbyport_r */
-#define GETSERVBYPORT_R_BUFSIZE 4096
-
-/* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#define HAVE_ARPA_NAMESER_COMPAT_H 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `bitncmp' function. */
-/* #undef HAVE_BITNCMP */
-
-/* Define to 1 if bool is an available type. */
-#define HAVE_BOOL_T 1
-
-/* Define to 1 if you have the clock_gettime function and monotonic timer. */
-#define HAVE_CLOCK_GETTIME_MONOTONIC 1
-
-/* Define to 1 if you have the closesocket function. */
-/* #undef HAVE_CLOSESOCKET */
-
-/* Define to 1 if you have the CloseSocket camel case function. */
-/* #undef HAVE_CLOSESOCKET_CAMEL */
-
-/* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the fcntl function. */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#define HAVE_FCNTL_O_NONBLOCK 1
-
-/* Define to 1 if you have the freeaddrinfo function. */
-#define HAVE_FREEADDRINFO 1
-
-/* Define to 1 if you have a working getaddrinfo function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if the getaddrinfo function is threadsafe. */
-#define HAVE_GETADDRINFO_THREADSAFE 1
-
-/* Define to 1 if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
-
-/* Define to 1 if you have the gethostbyname function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the getservbyport_r function. */
-#define HAVE_GETSERVBYPORT_R 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
-
-/* Define to 1 if you have the `inet_net_pton' function. */
-/* #undef HAVE_INET_NET_PTON */
-
-/* Define to 1 if inet_net_pton supports IPv6. */
-/* #undef HAVE_INET_NET_PTON_IPV6 */
-
-/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#define HAVE_INET_PTON 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the ioctl function. */
-#define HAVE_IOCTL 1
-
-/* Define to 1 if you have the ioctlsocket function. */
-/* #undef HAVE_IOCTLSOCKET */
-
-/* Define to 1 if you have the IoctlSocket camel case function. */
-/* #undef HAVE_IOCTLSOCKET_CAMEL */
-
-/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
-   */
-/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
-
-/* Define to 1 if you have a working ioctlsocket FIONBIO function. */
-/* #undef HAVE_IOCTLSOCKET_FIONBIO */
-
-/* Define to 1 if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO 1
-
-/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#define HAVE_IOCTL_SIOCGIFADDR 1
-
-/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* if your compiler supports LL */
-#define HAVE_LL 1
-
-/* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG 1
-
-/* Define to 1 if you have the malloc.h header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the MSG_NOSIGNAL flag. */
-#define HAVE_MSG_NOSIGNAL 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
-
-/* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6 1
-
-/* Define to 1 if you have the recv function. */
-#define HAVE_RECV 1
-
-/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
-
-/* Define to 1 if you have the send function. */
-#define HAVE_SEND 1
-
-/* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT 1
-
-/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
-/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if sig_atomic_t is an available typedef. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if sig_atomic_t is already defined as volatile. */
-/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
-
-/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <socket.h> header file. */
-/* #undef HAVE_SOCKET_H */
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the strcmpi function. */
-/* #undef HAVE_STRCMPI */
-
-/* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the stricmp function. */
-/* #undef HAVE_STRICMP */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the strncmpi function. */
-/* #undef HAVE_STRNCMPI */
-
-/* Define to 1 if you have the strnicmp function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the <stropts.h> header file. */
-#define HAVE_STROPTS_H 1
-
-/* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the windows.h header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if you have the winsock2.h header file. */
-/* #undef HAVE_WINSOCK2_H */
-
-/* Define to 1 if you have the winsock.h header file. */
-/* #undef HAVE_WINSOCK_H */
-
-/* Define to 1 if you have the writev function. */
-#define HAVE_WRITEV 1
-
-/* Define to 1 if you have the ws2tcpip.h header file. */
-/* #undef HAVE_WS2TCPIP_H */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #undef NEED_MALLOC_H */
-
-/* Define to 1 if you need the memory.h header file even with stdlib.h */
-/* #undef NEED_MEMORY_H */
-
-/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
-/* #undef NEED_REENTRANT */
-
-/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
-/* #undef NEED_THREAD_SAFE */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* cpu-machine-OS */
-#define OS "x86_64-unknown-linux-gnu"
-
-/* Name of package */
-#define PACKAGE "c-ares"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "c-ares"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "c-ares 1.7.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "c-ares"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.1"
-
-/* a suitable file/device to read random data from */
-#define RANDOM_FILE "/dev/urandom"
-
-/* Define to the type of arg 1 for recvfrom. */
-#define RECVFROM_TYPE_ARG1 int
-
-/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 void
-
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
-
-/* Define to the type of arg 3 for recvfrom. */
-#define RECVFROM_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recvfrom. */
-#define RECVFROM_TYPE_ARG4 int
-
-/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
-
-/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-
-/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 socklen_t
-
-/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
-
-/* Define to the function return type for recvfrom. */
-#define RECVFROM_TYPE_RETV ssize_t
-
-/* Define to the type of arg 1 for recv. */
-#define RECV_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for recv. */
-#define RECV_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for recv. */
-#define RECV_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for recv. */
-#define RECV_TYPE_ARG4 int
-
-/* Define to the function return type for recv. */
-#define RECV_TYPE_RETV ssize_t
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
-
-/* Define to the type of arg 1 for send. */
-#define SEND_TYPE_ARG1 int
-
-/* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 void *
-
-/* Define to the type of arg 3 for send. */
-#define SEND_TYPE_ARG3 size_t
-
-/* Define to the type of arg 4 for send. */
-#define SEND_TYPE_ARG4 int
-
-/* Define to the function return type for send. */
-#define SEND_TYPE_RETV ssize_t
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 8
-
-/* The size of `struct in6_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN6_ADDR 16
-
-/* The size of `struct in_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN_ADDR 4
-
-/* The size of `time_t', as computed by sizeof. */
-#define SIZEOF_TIME_T 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to disable non-blocking sockets. */
-/* #undef USE_BLOCKING_SOCKETS */
-
-/* Version number of package */
-#define VERSION "1.7.1"
-
-/* Define to avoid automatic inclusion of winsock.h */
-/* #undef WIN32_LEAN_AND_MEAN */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if OS is AIX. */
-#ifndef _ALL_SOURCE
-/* #  undef _ALL_SOURCE */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Type to use in place of in_addr_t when system does not provide it. */
-/* #undef in_addr_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* the signed version of size_t */
-/* #undef ssize_t */
--- a/deps/c-ares/linux-x64/ares_setup.h
+++ b/deps/c-ares/linux-x64/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/openbsd-ia32/ares_build.h
+++ b/deps/c-ares/openbsd-ia32/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/openbsd-ia32/ares_setup.h
+++ b/deps/c-ares/openbsd-ia32/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/openbsd-x64/ares_build.h
+++ b/deps/c-ares/openbsd-x64/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 8
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/openbsd-x64/ares_setup.h
+++ b/deps/c-ares/openbsd-x64/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/sunos-ia32/ares_build.h
+++ b/deps/c-ares/sunos-ia32/ares_build.h
@@ -1,112 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/sunos-ia32/ares_setup.h
+++ b/deps/c-ares/sunos-ia32/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/win32-ia32/ares_build.h
+++ b/deps/c-ares/win32-ia32/ares_build.h
@@ -1,111 +0,0 @@
-/* ares_build.h.  Generated from ares_build.h.in by configure.  */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/* ================================================================ */
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-#  error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-#  error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
-   Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system  */
-/* header file ws2tcpip.h must be included by the external interface. */
-#define CARES_PULL_WS2TCPIP_H 1
-#ifdef CARES_PULL_WS2TCPIP_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN 1
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system   */
-/* header file sys/types.h must be included by the external interface. */
-/* #undef CARES_PULL_SYS_TYPES_H */
-#ifdef CARES_PULL_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system    */
-/* header file sys/socket.h must be included by the external interface. */
-/* #undef CARES_PULL_SYS_SOCKET_H */
-#ifdef CARES_PULL_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
--- a/deps/c-ares/win32-ia32/ares_config.h
+++ b/deps/c-ares/win32-ia32/ares_config.h
@@ -1,513 +0,0 @@
-/* ares_config.h.  Generated from ares_config.h.in by configure.  */
-/* ares_config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* define this if ares is built for a big endian system */
-/* #undef ARES_BIG_ENDIAN */
-
-/* when building as static part of libcurl */
-/* #undef BUILDING_LIBCURL */
-
-/* when building c-ares library */
-/* #undef CARES_BUILDING_LIBRARY */
-
-/* when not building a shared library */
-#define CARES_STATICLIB 1
-
-/* Define to 1 to enable hiding of library internal symbols. */
-/* #undef CARES_SYMBOL_HIDING */
-
-/* Definition to make a library symbol externally visible. */
-/* #undef CARES_SYMBOL_SCOPE_EXTERN */
-
-/* if a /etc/inet dir is being used */
-/* #undef ETC_INET */
-
-/* Define to the type qualifier of arg 1 for getnameinfo. */
-/* #undef GETNAMEINFO_QUAL_ARG1 */
-
-/* Define to the type of arg 1 for getnameinfo. */
-/* #undef GETNAMEINFO_TYPE_ARG1 */
-
-/* Define to the type of arg 2 for getnameinfo. */
-/* #undef GETNAMEINFO_TYPE_ARG2 */
-
-/* Define to the type of args 4 and 6 for getnameinfo. */
-/* #undef GETNAMEINFO_TYPE_ARG46 */
-
-/* Define to the type of arg 7 for getnameinfo. */
-/* #undef GETNAMEINFO_TYPE_ARG7 */
-
-/* Specifies the number of arguments to getservbyport_r */
-/* #undef GETSERVBYPORT_R_ARGS */
-
-/* Specifies the size of the buffer to pass to getservbyport_r */
-/* #undef GETSERVBYPORT_R_BUFSIZE */
-
-/* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef HAVE_ARPA_INET_H */
-
-/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-/* #undef HAVE_ARPA_NAMESER_COMPAT_H */
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-/* #undef HAVE_ARPA_NAMESER_H */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `bitncmp' function. */
-/* #undef HAVE_BITNCMP */
-
-/* Define to 1 if bool is an available type. */
-#define HAVE_BOOL_T 1
-
-/* Define to 1 if you have the clock_gettime function and monotonic timer. */
-/* #undef HAVE_CLOCK_GETTIME_MONOTONIC */
-
-/* Define to 1 if you have the closesocket function. */
-#define HAVE_CLOSESOCKET 1
-
-/* Define to 1 if you have the CloseSocket camel case function. */
-/* #undef HAVE_CLOSESOCKET_CAMEL */
-
-/* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the fcntl function. */
-/* #undef HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-/* #undef HAVE_FCNTL_O_NONBLOCK */
-
-/* Define to 1 if you have the freeaddrinfo function. */
-/* #undef HAVE_FREEADDRINFO */
-
-/* Define to 1 if you have a working getaddrinfo function. */
-/* #undef HAVE_GETADDRINFO */
-
-/* Define to 1 if the getaddrinfo function is threadsafe. */
-/* #undef HAVE_GETADDRINFO_THREADSAFE */
-
-/* Define to 1 if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
-
-/* Define to 1 if you have the gethostbyname function. */
-#define HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
-
-/* Define to 1 if you have the getnameinfo function. */
-/* #undef HAVE_GETNAMEINFO */
-
-/* Define to 1 if you have the getservbyport_r function. */
-/* #undef HAVE_GETSERVBYPORT_R */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `if_indextoname' function. */
-/* #undef HAVE_IF_INDEXTONAME */
-
-/* Define to 1 if you have the `inet_net_pton' function. */
-/* #undef HAVE_INET_NET_PTON */
-
-/* Define to 1 if inet_net_pton supports IPv6. */
-/* #undef HAVE_INET_NET_PTON_IPV6 */
-
-/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-/* #undef HAVE_INET_NTOP */
-
-/* Define to 1 if you have a IPv6 capable working inet_pton function. */
-/* #undef HAVE_INET_PTON */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the ioctl function. */
-/* #undef HAVE_IOCTL */
-
-/* Define to 1 if you have the ioctlsocket function. */
-#define HAVE_IOCTLSOCKET 1
-
-/* Define to 1 if you have the IoctlSocket camel case function. */
-/* #undef HAVE_IOCTLSOCKET_CAMEL */
-
-/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
-   */
-/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
-
-/* Define to 1 if you have a working ioctlsocket FIONBIO function. */
-#define HAVE_IOCTLSOCKET_FIONBIO 1
-
-/* Define to 1 if you have a working ioctl FIONBIO function. */
-/* #undef HAVE_IOCTL_FIONBIO */
-
-/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-/* #undef HAVE_IOCTL_SIOCGIFADDR */
-
-/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* if your compiler supports LL */
-#define HAVE_LL 1
-
-/* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG 1
-
-/* Define to 1 if you have the malloc.h header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the MSG_NOSIGNAL flag. */
-/* #undef HAVE_MSG_NOSIGNAL */
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-/* #undef HAVE_NETINET_IN_H */
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-/* #undef HAVE_NETINET_TCP_H */
-
-/* Define to 1 if you have the <net/if.h> header file. */
-/* #undef HAVE_NET_IF_H */
-
-/* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6 1
-
-/* Define to 1 if you have the recv function. */
-#define HAVE_RECV 1
-
-/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
-
-/* Define to 1 if you have the send function. */
-#define HAVE_SEND 1
-
-/* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT 1
-
-/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
-/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if sig_atomic_t is an available typedef. */
-#define HAVE_SIG_ATOMIC_T 1
-
-/* Define to 1 if sig_atomic_t is already defined as volatile. */
-/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
-
-/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <socket.h> header file. */
-/* #undef HAVE_SOCKET_H */
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the strcmpi function. */
-#define HAVE_STRCMPI 1
-
-/* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the stricmp function. */
-#define HAVE_STRICMP 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the strncmpi function. */
-/* #undef HAVE_STRNCMPI */
-
-/* Define to 1 if you have the strnicmp function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the <stropts.h> header file. */
-/* #undef HAVE_STROPTS_H */
-
-/* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* 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/socket.h> header file. */
-/* #undef HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #undef HAVE_SYS_UIO_H */
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the windows.h header file. */
-#define HAVE_WINDOWS_H 1
-
-/* Define to 1 if you have the winsock2.h header file. */
-#define HAVE_WINSOCK2_H 1
-
-/* Define to 1 if you have the winsock.h header file. */
-#define HAVE_WINSOCK_H 1
-
-/* Define to 1 if you have the writev function. */
-/* #undef HAVE_WRITEV */
-
-/* Define to 1 if you have the ws2tcpip.h header file. */
-#define HAVE_WS2TCPIP_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if you are building a native Windows target. */
-#define NATIVE_WINDOWS 1
-
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #undef NEED_MALLOC_H */
-
-/* Define to 1 if you need the memory.h header file even with stdlib.h */
-/* #undef NEED_MEMORY_H */
-
-/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
-/* #undef NEED_REENTRANT */
-
-/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
-/* #undef NEED_THREAD_SAFE */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* cpu-machine-OS */
-#define OS "i686-pc-mingw32"
-
-/* Name of package */
-#define PACKAGE "c-ares"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "c-ares"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "c-ares 1.7.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "c-ares"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.3"
-
-/* a suitable file/device to read random data from */
-#define RANDOM_FILE "/dev/urandom"
-
-/* Define to the type of arg 1 for recvfrom. */
-#define RECVFROM_TYPE_ARG1 SOCKET
-
-/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 char
-
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG2_IS_VOID */
-
-/* Define to the type of arg 3 for recvfrom. */
-#define RECVFROM_TYPE_ARG3 int
-
-/* Define to the type of arg 4 for recvfrom. */
-#define RECVFROM_TYPE_ARG4 int
-
-/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
-
-/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-
-/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 int
-
-/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
-
-/* Define to the function return type for recvfrom. */
-#define RECVFROM_TYPE_RETV int
-
-/* Define to the type of arg 1 for recv. */
-#define RECV_TYPE_ARG1 SOCKET
-
-/* Define to the type of arg 2 for recv. */
-#define RECV_TYPE_ARG2 char *
-
-/* Define to the type of arg 3 for recv. */
-#define RECV_TYPE_ARG3 int
-
-/* Define to the type of arg 4 for recv. */
-#define RECV_TYPE_ARG4 int
-
-/* Define to the function return type for recv. */
-#define RECV_TYPE_RETV int
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
-
-/* Define to the type of arg 1 for send. */
-#define SEND_TYPE_ARG1 SOCKET
-
-/* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 char *
-
-/* Define to the type of arg 3 for send. */
-#define SEND_TYPE_ARG3 int
-
-/* Define to the type of arg 4 for send. */
-#define SEND_TYPE_ARG4 int
-
-/* Define to the function return type for send. */
-#define SEND_TYPE_RETV int
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 4
-
-/* The size of `struct in6_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN6_ADDR 16
-
-/* The size of `struct in_addr', as computed by sizeof. */
-#define SIZEOF_STRUCT_IN_ADDR 4
-
-/* The size of `time_t', as computed by sizeof. */
-#define SIZEOF_TIME_T 4
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to disable non-blocking sockets. */
-/* #undef USE_BLOCKING_SOCKETS */
-
-/* Version number of package */
-#define VERSION "1.7.3"
-
-/* Define to avoid automatic inclusion of winsock.h */
-#define WIN32_LEAN_AND_MEAN 1
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if OS is AIX. */
-#ifndef _ALL_SOURCE
-/* #  undef _ALL_SOURCE */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Type to use in place of in_addr_t when system does not provide it. */
-#define in_addr_t unsigned long
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* the signed version of size_t */
-/* #undef ssize_t */
--- a/deps/c-ares/win32-ia32/ares_setup.h
+++ b/deps/c-ares/win32-ia32/ares_setup.h
@@ -1,198 +0,0 @@
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/* $Id$ */
-
-/* Copyright (C) 2004 - 2009 by Daniel Stenberg et al
- *
- * 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.
- */
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "ares_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
-/*
- * c-ares external interface definitions are also used internally,
- * and might also include required system header files to define them.
- */
-
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
-
-/* ================================================================= */
-/* No system header file shall be included in this file before this  */
-/* point. The only allowed ones are those included from ares_build.h */
-/* ================================================================= */
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block.  Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined.  configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  ifdef HAVE_WINSOCK2_H
-#    include <winsock2.h>
-#    ifdef HAVE_WS2TCPIP_H
-#       include <ws2tcpip.h>
-#    endif
-#  else
-#    ifdef HAVE_WINSOCK_H
-#      include <winsock.h>
-#    endif
-#  endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
-#endif
-
-/*
- * Work-arounds for systems without configure support
- */
-
-#ifndef HAVE_CONFIG_H
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-#ifdef __POCC__
-#  include <sys/types.h>
-#  include <unistd.h>
-#  define ESRCH 3
-#endif
-
-/*
- * Recent autoconf versions define these symbols in ares_config.h. We don't
- * want them (since they collide with the libcurl ones when we build
- *  --enable-debug) so we undef them again here.
- */
-
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef VERSION
-#undef PACKAGE
-
-/* IPv6 compatibility */
-#if !defined(HAVE_AF_INET6)
-#if defined(HAVE_PF_INET6)
-#define AF_INET6 PF_INET6
-#else
-#define AF_INET6 AF_MAX+1
-#endif
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-#endif /* HEADER_CARES_SETUP_H */
--- a/deps/c-ares/wscript
+++ b/deps/c-ares/wscript
@@ -1,26 +0,0 @@
-import Options
-import platform
-
-PLATFORM_IS_DARWIN = platform.platform().find('Darwin') == 0
-PLATFORM_IS_LINUX = platform.platform().find('Linux') == 0
-PLATFORM_IS_SOLARIS = platform.platform().find('Sun') == 0
-PLATFORM_IS_FREEBSD = platform.platform().find('FreeBSD') == 0
-MACHINE_IS_AMD64 = platform.machine().find('amd64') == 0
-MACHINE_IS_I386 = platform.machine().find('i386') == 0
-
-def set_options(opt):
-  pass
-
-def configure(conf):
-  conf.env.append_value('CCFLAGS', ['-DHAVE_CONFIG_H=1'])
-
-def build(bld):
-  cares = bld.new_task_gen("cc")
-  cares.source = bld.path.ant_glob('*.c')
-  cares.target = 'cares'
-  cares.name = 'cares'
-  cares.includes = '. ./' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
-  cares.install_path = None
-  if bld.env["USE_DEBUG"]:
-    cares.clone("debug");
-
--- a/deps/http_parser/.gitignore
+++ b/deps/http_parser/.gitignore
@@ -2,3 +2,7 @@ tags
 *.o
 test
 test_g
+test_fast
+http_parser.Makefile
+http_parser.target.mk
+test.target.mk
--- a/deps/http_parser/LICENSE-MIT
+++ b/deps/http_parser/LICENSE-MIT
@@ -1,4 +1,8 @@
-Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+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
--- a/deps/http_parser/Makefile
+++ b/deps/http_parser/Makefile
@@ -1,41 +1,52 @@
-OPT_DEBUG=-O0 -g -Wall -Wextra -Werror -I.
-OPT_FAST=-O3 -DHTTP_PARSER_STRICT=0 -I.
-
 CC?=gcc
+AR?=ar
+
+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)


-test: test_g
+test: test_g test_fast
 	./test_g
+	./test_fast

 test_g: http_parser_g.o test_g.o
-	$(CC) $(OPT_DEBUG) http_parser_g.o test_g.o -o $@
+	$(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o test_g.o -o $@

 test_g.o: test.c http_parser.h Makefile
-	$(CC) $(OPT_DEBUG) -c test.c -o $@
-
-test.o: test.c http_parser.h Makefile
-	$(CC) $(OPT_FAST) -c test.c -o $@
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c test.c -o $@

 http_parser_g.o: http_parser.c http_parser.h Makefile
-	$(CC) $(OPT_DEBUG) -c http_parser.c -o $@
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c http_parser.c -o $@

-test-valgrind: test_g
-	valgrind ./test_g
+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
-	$(CC) $(OPT_FAST) -c http_parser.c
-
-test_fast: http_parser.o test.c http_parser.h
-	$(CC) $(OPT_FAST) http_parser.o test.c -o $@
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c

 test-run-timed: test_fast
 	while(true) do time ./test_fast > /dev/null; done

+test-valgrind: test_g
+	valgrind ./test_g
+
+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 test test_fast test_g http_parser.tar tags
+	rm -f *.o *.a test test_fast test_g http_parser.tar tags

 .PHONY: clean package test-run test-run-timed test-valgrind
--- a/deps/http_parser/README.md
+++ b/deps/http_parser/README.md
@@ -24,7 +24,7 @@ The parser extracts the following information from HTTP messages:
  * Response status code
  * Transfer-Encoding
  * HTTP version
-  * Request path, query string, fragment
+  * Request URL
  * Message body


@@ -126,7 +126,7 @@ 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
--- 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,34 @@
+# 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 
+{
+  'targets': [
+    {
+      'target_name': 'http_parser',
+      'type': '<(library)',
+      'include_dirs': [ '.' ],
+      'direct_dependent_settings': {
+        'include_dirs': [ '.' ],
+      },
+      'defines': [ 'HTTP_PARSER_STRICT=0' ],
+      'sources': [ './http_parser.c', ],
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          # Compile as C++. http_parser.c is actually C99, but C++ is
+          # close enough in this case.
+          'CompileAs': 2, # compile as C++
+        },
+      },
+    },
+    {
+      '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,4 +1,4 @@
-/* Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+/* 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
@@ -24,9 +24,11 @@
 extern "C" {
 #endif

+#define HTTP_PARSER_VERSION_MAJOR 1
+#define HTTP_PARSER_VERSION_MINOR 0

 #include <sys/types.h>
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(_MSC_VER)
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
@@ -47,8 +49,13 @@ typedef int ssize_t;
 */
 #ifndef HTTP_PARSER_STRICT
 # define HTTP_PARSER_STRICT 1
-#else
-# define HTTP_PARSER_STRICT 0
+#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


@@ -58,6 +65,7 @@ typedef int ssize_t;

 typedef struct http_parser http_parser;
 typedef struct http_parser_settings http_parser_settings;
+typedef struct http_parser_result http_parser_result;


 /* Callbacks should return non-zero to indicate an error. The parser will
@@ -106,16 +114,95 @@ enum http_method
  , HTTP_NOTIFY
  , HTTP_SUBSCRIBE
  , HTTP_UNSUBSCRIBE
+  /* RFC-5789 */
+  , HTTP_PATCH
  };


 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_path, "the on_path callback failed")                         \
+  XX(CB_query_string, "the on_query_string callback failed")         \
+  XX(CB_url, "the on_url callback failed")                           \
+  XX(CB_fragment, "the on_fragment 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(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
+
+
 struct http_parser {
  /** PRIVATE **/
  unsigned char type : 2;
-  unsigned char flags : 6;
+  unsigned char flags : 6; /* F_* values from 'flags' enum; semi-public */
  unsigned char state;
  unsigned char header_state;
  unsigned char index;
@@ -128,13 +215,18 @@ struct http_parser {
  unsigned short http_minor;
  unsigned short status_code; /* responses only */
  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.
   */
-  char upgrade;
+  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 */
@@ -143,10 +235,7 @@ struct http_parser {

 struct http_parser_settings {
  http_cb      on_message_begin;
-  http_data_cb on_path;
-  http_data_cb on_query_string;
  http_data_cb on_url;
-  http_data_cb on_fragment;
  http_data_cb on_header_field;
  http_data_cb on_header_value;
  http_cb      on_headers_complete;
@@ -173,7 +262,13 @@ size_t http_parser_execute(http_parser *parser,
 int http_should_keep_alive(http_parser *parser);

 /* Returns a string version of the HTTP method. */
-const char *http_method_str(enum 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);

 #ifdef __cplusplus
 }
--- a/deps/http_parser/test.c
+++ b/deps/http_parser/test.c
@@ -1,4 +1,4 @@
-/* Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+/* 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
@@ -44,10 +44,7 @@ struct message {
  enum http_parser_type type;
  enum http_method method;
  int status_code;
-  char request_path[MAX_ELEMENT_SIZE];
  char request_url[MAX_ELEMENT_SIZE];
-  char fragment[MAX_ELEMENT_SIZE];
-  char query_string[MAX_ELEMENT_SIZE];
  char body[MAX_ELEMENT_SIZE];
  size_t body_size;
  int num_headers;
@@ -55,7 +52,7 @@ struct message {
  char headers [MAX_HEADERS][2][MAX_ELEMENT_SIZE];
  int should_keep_alive;

-  int upgrade;
+  const char *upgrade; // upgraded body

  unsigned short http_major;
  unsigned short http_minor;
@@ -86,9 +83,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
  ,.request_url= "/test"
  ,.num_headers= 3
  ,.headers=
@@ -117,9 +111,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/favicon.ico"
  ,.request_url= "/favicon.ico"
  ,.num_headers= 8
  ,.headers=
@@ -146,9 +137,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/dumbfuck"
  ,.request_url= "/dumbfuck"
  ,.num_headers= 1
  ,.headers=
@@ -167,9 +155,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= "page=1"
-  ,.fragment= "posts-17408"
-  ,.request_path= "/forums/1/topics/2375"
  /* XXX request url does include fragment? */
  ,.request_url= "/forums/1/topics/2375?page=1#posts-17408"
  ,.num_headers= 0
@@ -186,9 +171,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/get_no_headers_no_body/world"
  ,.request_url= "/get_no_headers_no_body/world"
  ,.num_headers= 0
  ,.body= ""
@@ -205,9 +187,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/get_one_header_no_body"
  ,.request_url= "/get_one_header_no_body"
  ,.num_headers= 1
  ,.headers=
@@ -228,9 +207,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 0
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/get_funky_content_length_body_hello"
  ,.request_url= "/get_funky_content_length_body_hello"
  ,.num_headers= 1
  ,.headers=
@@ -253,9 +229,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_POST
-  ,.query_string= "q=search"
-  ,.fragment= "hey"
-  ,.request_path= "/post_identity_body_world"
  ,.request_url= "/post_identity_body_world?q=search#hey"
  ,.num_headers= 3
  ,.headers=
@@ -280,9 +253,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/post_chunked_all_your_base"
  ,.request_url= "/post_chunked_all_your_base"
  ,.num_headers= 1
  ,.headers=
@@ -306,9 +276,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/two_chunks_mult_zero_end"
  ,.request_url= "/two_chunks_mult_zero_end"
  ,.num_headers= 1
  ,.headers=
@@ -334,9 +301,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/chunked_w_trailing_headers"
  ,.request_url= "/chunked_w_trailing_headers"
  ,.num_headers= 3
  ,.headers=
@@ -362,9 +326,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_POST
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/chunked_w_bullshit_after_length"
  ,.request_url= "/chunked_w_bullshit_after_length"
  ,.num_headers= 1
  ,.headers=
@@ -382,9 +343,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= "foo=\"bar\""
-  ,.fragment= ""
-  ,.request_path= "/with_\"stupid\"_quotes"
  ,.request_url= "/with_\"stupid\"_quotes?foo=\"bar\""
  ,.num_headers= 0
  ,.headers= { }
@@ -408,9 +366,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 0
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
  ,.request_url= "/test"
  ,.num_headers= 3
  ,.headers= { { "Host", "0.0.0.0:5000" }
@@ -431,9 +386,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= "foo=bar?baz"
-  ,.fragment= ""
-  ,.request_path= "/test.cgi"
  ,.request_url= "/test.cgi?foo=bar?baz"
  ,.num_headers= 0
  ,.headers= {}
@@ -452,9 +404,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
  ,.request_url= "/test"
  ,.num_headers= 0
  ,.headers= { }
@@ -473,17 +422,15 @@ const struct message requests[] =
         "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
         "Origin: http://example.com\r\n"
         "\r\n"
+         "Hot diggity dogg"
  ,.should_keep_alive= TRUE
  ,.message_complete_on_eof= FALSE
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/demo"
  ,.request_url= "/demo"
  ,.num_headers= 7
-  ,.upgrade=1
+  ,.upgrade="Hot diggity dogg"
  ,.headers= { { "Host", "example.com" }
             , { "Connection", "Upgrade" }
             , { "Sec-WebSocket-Key2", "12998 5 Y3 1  .P00" }
@@ -498,21 +445,20 @@ const struct message requests[] =
 #define CONNECT_REQUEST 17
 , {.name = "connect request"
  ,.type= HTTP_REQUEST
-  ,.raw= "CONNECT home0.netscape.com:443 HTTP/1.0\r\n"
+  ,.raw= "CONNECT 0-home0.netscape.com:443 HTTP/1.0\r\n"
         "User-agent: Mozilla/1.1N\r\n"
         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
         "\r\n"
+         "some data\r\n"
+         "and yet even more data"
  ,.should_keep_alive= FALSE
  ,.message_complete_on_eof= FALSE
  ,.http_major= 1
  ,.http_minor= 0
  ,.method= HTTP_CONNECT
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= ""
-  ,.request_url= "home0.netscape.com:443"
+  ,.request_url= "0-home0.netscape.com:443"
  ,.num_headers= 2
-  ,.upgrade=1
+  ,.upgrade="some data\r\nand yet even more data"
  ,.headers= { { "User-agent", "Mozilla/1.1N" }
             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
             }
@@ -529,9 +475,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_REPORT
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/test"
  ,.request_url= "/test"
  ,.num_headers= 0
  ,.headers= {}
@@ -548,16 +491,13 @@ const struct message requests[] =
  ,.http_major= 0
  ,.http_minor= 9
  ,.method= HTTP_GET
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "/"
  ,.request_url= "/"
  ,.num_headers= 0
  ,.headers= {}
  ,.body= ""
  }

-#define MSEARCH_REQ 19
+#define MSEARCH_REQ 20
 , {.name= "m-search request"
  ,.type= HTTP_REQUEST
  ,.raw= "M-SEARCH * HTTP/1.1\r\n"
@@ -570,9 +510,6 @@ const struct message requests[] =
  ,.http_major= 1
  ,.http_minor= 1
  ,.method= HTTP_MSEARCH
-  ,.query_string= ""
-  ,.fragment= ""
-  ,.request_path= "*"
  ,.request_url= "*"
  ,.num_headers= 3
  ,.headers= { { "HOST", "239.255.255.250:1900" }
@@ -582,6 +519,167 @@ const struct message requests[] =
  ,.body= ""
  }

+#define LINE_FOLDING_IN_HEADER 20
+, {.name= "line folding in header value"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET / HTTP/1.1\r\n"
+         "Line1:   abc\r\n"
+         "\tdef\r\n"
+         " ghi\r\n"
+         "\t\tjkl\r\n"
+         "  mno \r\n"
+         "\t \tqrs\r\n"
+         "Line2: \t line2\t\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.request_url= "/"
+  ,.num_headers= 2
+  ,.headers= { { "Line1", "abcdefghijklmno qrs" }
+             , { "Line2", "line2\t" }
+             }
+  ,.body= ""
+  }
+
+
+#define QUERY_TERMINATED_HOST 21
+, {.name= "host terminated by a query string"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org?hail=all HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.request_url= "http://hypnotoad.org?hail=all"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define QUERY_TERMINATED_HOSTPORT 22
+, {.name= "host:port terminated by a query string"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org:1234?hail=all HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.request_url= "http://hypnotoad.org:1234?hail=all"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define SPACE_TERMINATED_HOSTPORT 23
+, {.name= "host:port terminated by a space"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org:1234 HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.request_url= "http://hypnotoad.org:1234"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#if !HTTP_PARSER_STRICT
+#define UTF8_PATH_REQ 24
+, {.name= "utf-8 path request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\n"
+         "Host: github.com\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.request_url= "/δ¶/δt/pope?q=1#narf"
+  ,.num_headers= 1
+  ,.headers= { {"Host", "github.com" }
+             }
+  ,.body= ""
+  }
+
+#define HOSTNAME_UNDERSCORE 25
+, {.name = "hostname underscore"
+  ,.type= HTTP_REQUEST
+  ,.raw= "CONNECT home_0.netscape.com:443 HTTP/1.0\r\n"
+         "User-agent: Mozilla/1.1N\r\n"
+         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_CONNECT
+  ,.request_url= "home_0.netscape.com:443"
+  ,.num_headers= 2
+  ,.upgrade=""
+  ,.headers= { { "User-agent", "Mozilla/1.1N" }
+             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
+             }
+  ,.body= ""
+  }
+#endif  /* !HTTP_PARSER_STRICT */
+
+#define PATCH_REQ 26
+, {.name = "PATCH request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "PATCH /file.txt HTTP/1.1\r\n"
+         "Host: www.example.com\r\n"
+         "Content-Type: application/example\r\n"
+         "If-Match: \"e0023aa4e\"\r\n"
+         "Content-Length: 10\r\n"
+         "\r\n"
+         "cccccccccc"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_PATCH
+  ,.request_url= "/file.txt"
+  ,.num_headers= 4
+  ,.headers= { { "Host", "www.example.com" }
+             , { "Content-Type", "application/example" }
+             , { "If-Match", "\"e0023aa4e\"" }
+             , { "Content-Length", "10" }
+             }
+  ,.body= "cccccccccc"
+  }
+
+#define CONNECT_CAPS_REQUEST 27
+, {.name = "connect caps request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "CONNECT HOME0.NETSCAPE.COM:443 HTTP/1.0\r\n"
+         "User-agent: Mozilla/1.1N\r\n"
+         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_CONNECT
+  ,.request_url= "HOME0.NETSCAPE.COM:443"
+  ,.num_headers= 2
+  ,.upgrade=""
+  ,.headers= { { "User-agent", "Mozilla/1.1N" }
+             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
+             }
+  ,.body= ""
+  }
+
 , {.name= NULL } /* sentinel */
 };

@@ -947,14 +1045,6 @@ const struct message responses[] =
 , {.name= NULL } /* sentinel */
 };

-int
-request_path_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  strncat(messages[num_messages].request_path, buf, len);
-  return 0;
-}
-
 int
 request_url_cb (http_parser *p, const char *buf, size_t len)
 {
@@ -963,22 +1053,6 @@ request_url_cb (http_parser *p, const char *buf, size_t len)
  return 0;
 }

-int
-query_string_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  strncat(messages[num_messages].query_string, buf, len);
-  return 0;
-}
-
-int
-fragment_cb (http_parser *p, const char *buf, size_t len)
-{
-  assert(p == parser);
-  strncat(messages[num_messages].fragment, buf, len);
-  return 0;
-}
-
 int
 header_field_cb (http_parser *p, const char *buf, size_t len)
 {
@@ -1072,10 +1146,7 @@ static http_parser_settings settings =
  {.on_message_begin = message_begin_cb
  ,.on_header_field = header_field_cb
  ,.on_header_value = header_value_cb
-  ,.on_path = request_path_cb
  ,.on_url = request_url_cb
-  ,.on_fragment = fragment_cb
-  ,.on_query_string = query_string_cb
  ,.on_body = body_cb
  ,.on_headers_complete = headers_complete_cb
  ,.on_message_complete = message_complete_cb
@@ -1085,10 +1156,7 @@ static http_parser_settings settings_count_body =
  {.on_message_begin = message_begin_cb
  ,.on_header_field = header_field_cb
  ,.on_header_value = header_value_cb
-  ,.on_path = request_path_cb
  ,.on_url = request_url_cb
-  ,.on_fragment = fragment_cb
-  ,.on_query_string = query_string_cb
  ,.on_body = count_body_cb
  ,.on_headers_complete = headers_complete_cb
  ,.on_message_complete = message_complete_cb
@@ -1098,10 +1166,7 @@ static http_parser_settings settings_null =
  {.on_message_begin = 0
  ,.on_header_field = 0
  ,.on_header_value = 0
-  ,.on_path = 0
  ,.on_url = 0
-  ,.on_fragment = 0
-  ,.on_query_string = 0
  ,.on_body = 0
  ,.on_headers_complete = 0
  ,.on_message_complete = 0
@@ -1151,7 +1216,13 @@ check_str_eq (const struct message *m,
              const char *prop,
              const char *expected,
              const char *found) {
-  if (0 != strcmp(expected, found)) {
+  if ((expected == NULL) != (found == NULL)) {
+    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
+    printf("expected %s\n", (expected == NULL) ? "NULL" : expected);
+    printf("   found %s\n", (found == NULL) ? "NULL" : found);
+    return 0;
+  }
+  if (expected != NULL && 0 != strcmp(expected, found)) {
    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
    printf("expected '%s'\n", expected);
    printf("   found '%s'\n", found);
@@ -1204,9 +1275,6 @@ message_eq (int index, const struct message *expected)
  assert(m->message_complete_cb_called);


-  MESSAGE_CHECK_STR_EQ(expected, m, request_path);
-  MESSAGE_CHECK_STR_EQ(expected, m, query_string);
-  MESSAGE_CHECK_STR_EQ(expected, m, fragment);
  MESSAGE_CHECK_STR_EQ(expected, m, request_url);
  if (expected->body_size) {
    MESSAGE_CHECK_NUM_EQ(expected, m, body_size);
@@ -1224,13 +1292,81 @@ message_eq (int index, const struct message *expected)
    if (!r) return 0;
  }

+  MESSAGE_CHECK_STR_EQ(expected, m, upgrade);
+
  return 1;
 }

+/* Given a sequence of varargs messages, return the number of them that the
+ * parser should successfully parse, taking into account that upgraded
+ * messages prevent all subsequent messages from being parsed.
+ */
+size_t
+count_parsed_messages(const size_t nmsgs, ...) {
+  size_t i;
+  va_list ap;
+
+  va_start(ap, nmsgs);
+
+  for (i = 0; i < nmsgs; i++) {
+    struct message *m = va_arg(ap, struct message *);
+
+    if (m->upgrade) {
+      va_end(ap);
+      return i + 1;
+    }
+  }
+
+  va_end(ap);
+  return nmsgs;
+}
+
+/* Given a sequence of bytes and the number of these that we were able to
+ * parse, verify that upgrade bodies are correct.
+ */
+void
+upgrade_message_fix(char *body, const size_t nread, const size_t nmsgs, ...) {
+  va_list ap;
+  size_t i;
+  size_t off = 0;
+ 
+  va_start(ap, nmsgs);
+
+  for (i = 0; i < nmsgs; i++) {
+    struct message *m = va_arg(ap, struct message *);
+
+    off += strlen(m->raw);
+
+    if (m->upgrade) {
+      off -= strlen(m->upgrade);
+
+      /* Check the portion of the response after its specified upgrade */
+      if (!check_str_eq(m, "upgrade", body + off, body + nread)) {
+        exit(1);
+      }
+
+      /* Fix up the response so that message_eq() will verify the beginning
+       * of the upgrade */
+      *(body + nread + strlen(m->upgrade)) = '\0';
+      messages[num_messages -1 ].upgrade = body + nread;
+
+      va_end(ap);
+      return;
+    }
+  }
+
+  va_end(ap);
+  printf("\n\n*** Error: expected a message with upgrade ***\n");
+
+  exit(1);
+}
+
 static void
 print_error (const char *raw, size_t error_location)
 {
-  fprintf(stderr, "\n*** parse error ***\n\n");
+  fprintf(stderr, "\n*** %s:%d -- %s ***\n\n",
+          "http_parser.c", HTTP_PARSER_ERRNO_LINE(parser),
+          http_errno_description(HTTP_PARSER_ERRNO(parser)));

  int this_line = 0, char_len = 0;
  size_t i, j, len = strlen(raw), error_location_line = 0;
@@ -1285,7 +1421,10 @@ test_message (const struct message *message)
    if (msg1len) {
      read = parse(msg1, msg1len);

-      if (message->upgrade && parser->upgrade) goto test;
+      if (message->upgrade && parser->upgrade) {
+        messages[num_messages - 1].upgrade = msg1 + read;
+        goto test;
+      }

      if (read != msg1len) {
        print_error(msg1, read);
@@ -1296,7 +1435,10 @@ test_message (const struct message *message)

    read = parse(msg2, msg2len);

-    if (message->upgrade && parser->upgrade) goto test;
+    if (message->upgrade && parser->upgrade) {
+      messages[num_messages - 1].upgrade = msg2 + read;
+      goto test;
+    }

    if (read != msg2len) {
      print_error(msg2, read);
@@ -1305,8 +1447,6 @@ test_message (const struct message *message)

    read = parse(NULL, 0);

-    if (message->upgrade && parser->upgrade) goto test;
-
    if (read != 0) {
      print_error(message->raw, read);
      exit(1);
@@ -1362,21 +1502,32 @@ test_message_count_body (const struct message *message)
 }

 void
-test_simple (const char *buf, int should_pass)
+test_simple (const char *buf, enum http_errno err_expected)
 {
  parser_init(HTTP_REQUEST);

  size_t parsed;
  int pass;
+  enum http_errno err;
+
  parsed = parse(buf, strlen(buf));
  pass = (parsed == strlen(buf));
+  err = HTTP_PARSER_ERRNO(parser);
  parsed = parse(NULL, 0);
  pass &= (parsed == 0);

  parser_free();

-  if (pass != should_pass) {
-    fprintf(stderr, "\n*** test_simple expected %s ***\n\n%s", should_pass ? "success" : "error", buf);
+  /* In strict mode, allow us to pass with an unexpected HPE_STRICT as
+   * long as the caller isn't expecting success.
+   */
+#if HTTP_PARSER_STRICT
+  if (err_expected != err && err_expected != HPE_OK && err != HPE_STRICT) {
+#else
+  if (err_expected != err) {
+#endif
+    fprintf(stderr, "\n*** test_simple expected %s, but saw %s ***\n\n%s\n",
+        http_errno_name(err_expected), http_errno_name(err), buf);
    exit(1);
  }
 }
@@ -1393,10 +1544,14 @@ test_header_overflow_error (int req)
  assert(parsed == strlen(buf));

  buf = "header-key: header-value\r\n";
+  size_t buflen = strlen(buf);
+
  int i;
  for (i = 0; i < 10000; i++) {
-    if (http_parser_execute(&parser, &settings_null, buf, strlen(buf)) != strlen(buf)) {
+    parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
+    if (parsed != buflen) {
      //fprintf(stderr, "error found on iter %d\n", i);
+      assert(HTTP_PARSER_ERRNO(&parser) == HPE_HEADER_OVERFLOW);
      return;
    }
  }
@@ -1441,12 +1596,7 @@ test_no_overflow_long_body (int req, size_t length)
 void
 test_multiple3 (const struct message *r1, const struct message *r2, const struct message *r3)
 {
-  int message_count = 1;
-  if (!r1->upgrade) {
-    message_count++;
-    if (!r2->upgrade) message_count++;
-  }
-  int has_upgrade = (message_count < 3 || r3->upgrade);
+  int message_count = count_parsed_messages(3, r1, r2, r3);

  char total[ strlen(r1->raw)
            + strlen(r2->raw)
@@ -1465,7 +1615,10 @@ test_multiple3 (const struct message *r1, const struct message *r2, const struct

  read = parse(total, strlen(total));

-  if (has_upgrade && parser->upgrade) goto test;
+  if (parser->upgrade) {
+    upgrade_message_fix(total, read, 3, r1, r2, r3);
+    goto test;
+  }

  if (read != strlen(total)) {
    print_error(total, read);
@@ -1474,8 +1627,6 @@ test_multiple3 (const struct message *r1, const struct message *r2, const struct

  read = parse(NULL, 0);

-  if (has_upgrade && parser->upgrade) goto test;
-
  if (read != 0) {
    print_error(total, read);
    exit(1);
@@ -1489,12 +1640,8 @@ test:
  }

  if (!message_eq(0, r1)) exit(1);
-  if (message_count > 1) {
-    if (!message_eq(1, r2)) exit(1);
-    if (message_count > 2) {
-      if (!message_eq(2, r3)) exit(1);
-    }
-  }
+  if (message_count > 1 && !message_eq(1, r2)) exit(1);
+  if (message_count > 2 && !message_eq(2, r3)) exit(1);

  parser_free();
 }
@@ -1523,6 +1670,7 @@ test_scan (const struct message *r1, const struct message *r2, const struct mess
  int ops = 0 ;

  size_t buf1_len, buf2_len, buf3_len;
+  int message_count = count_parsed_messages(3, r1, r2, r3);

  int i,j,type_both;
  for (type_both = 0; type_both < 2; type_both ++ ) {
@@ -1551,27 +1699,27 @@ test_scan (const struct message *r1, const struct message *r2, const struct mess

        read = parse(buf1, buf1_len);

-        if (r3->upgrade && parser->upgrade) goto test;
+        if (parser->upgrade) goto test;

        if (read != buf1_len) {
          print_error(buf1, read);
          goto error;
        }

-        read = parse(buf2, buf2_len);
+        read += parse(buf2, buf2_len);

-        if (r3->upgrade && parser->upgrade) goto test;
+        if (parser->upgrade) goto test;

-        if (read != buf2_len) {
+        if (read != buf1_len + buf2_len) {
          print_error(buf2, read);
          goto error;
        }

-        read = parse(buf3, buf3_len);
+        read += parse(buf3, buf3_len);

-        if (r3->upgrade && parser->upgrade) goto test;
+        if (parser->upgrade) goto test;

-        if (read != buf3_len) {
+        if (read != buf1_len + buf2_len + buf3_len) {
          print_error(buf3, read);
          goto error;
        }
@@ -1579,9 +1727,13 @@ test_scan (const struct message *r1, const struct message *r2, const struct mess
        parse(NULL, 0);

 test:
+        if (parser->upgrade) {
+          upgrade_message_fix(total, read, 3, r1, r2, r3);
+        }

-        if (3 != num_messages) {
-          fprintf(stderr, "\n\nParser didn't see 3 messages only %d\n", num_messages);
+        if (message_count != num_messages) {
+          fprintf(stderr, "\n\nParser didn't see %d messages only %d\n",
+            message_count, num_messages);
          goto error;
        }

@@ -1590,12 +1742,12 @@ test:
          goto error;
        }

-        if (!message_eq(1, r2)) {
+        if (message_count > 1 && !message_eq(1, r2)) {
          fprintf(stderr, "\n\nError matching messages[1] in test_scan.\n");
          goto error;
        }

-        if (!message_eq(2, r3)) {
+        if (message_count > 2 && !message_eq(2, r3)) {
          fprintf(stderr, "\n\nError matching messages[2] in test_scan.\n");
          goto error;
        }
@@ -1735,13 +1887,21 @@ main (void)

  /// REQUESTS

+  test_simple("hello world", HPE_INVALID_METHOD);
+  test_simple("GET / HTP/1.1\r\n\r\n", HPE_INVALID_VERSION);

-  test_simple("hello world", 0);
-  test_simple("GET / HTP/1.1\r\n\r\n", 0);

-  test_simple("ASDF / HTTP/1.1\r\n\r\n", 0);
-  test_simple("PROPPATCHA / HTTP/1.1\r\n\r\n", 0);
-  test_simple("GETA / HTTP/1.1\r\n\r\n", 0);
+  test_simple("ASDF / HTTP/1.1\r\n\r\n", HPE_INVALID_METHOD);
+  test_simple("PROPPATCHA / HTTP/1.1\r\n\r\n", HPE_INVALID_METHOD);
+  test_simple("GETA / HTTP/1.1\r\n\r\n", HPE_INVALID_METHOD);
+
+  // Well-formed but incomplete
+  test_simple("GET / HTTP/1.1\r\n"
+              "Content-Type: text/plain\r\n"
+              "Content-Length: 6\r\n"
+              "\r\n"
+              "fooba",
+              HPE_OK);

  static const char *all_methods[] = {
    "DELETE",
@@ -1759,12 +1919,31 @@ main (void)
    "PROPFIND",
    "PROPPATCH",
    "UNLOCK",
+    "REPORT",
+    "MKACTIVITY",
+    "CHECKOUT",
+    "MERGE",
+    "M-SEARCH",
+    "NOTIFY",
+    "SUBSCRIBE",
+    "UNSUBSCRIBE",
+    "PATCH",
    0 };
  const char **this_method;
  for (this_method = all_methods; *this_method; this_method++) {
    char buf[200];
    sprintf(buf, "%s / HTTP/1.1\r\n\r\n", *this_method);
-    test_simple(buf, 1);
+    test_simple(buf, HPE_OK);
+  }
+
+  static const char *bad_methods[] = {
+      "C******",
+      "M****",
+      0 };
+  for (this_method = bad_methods; *this_method; this_method++) {
+    char buf[200];
+    sprintf(buf, "%s / HTTP/1.1\r\n\r\n", *this_method);
+    test_simple(buf, HPE_UNKNOWN);
  }

  const char *dumbfuck2 =
@@ -1802,7 +1981,7 @@ main (void)
    "\tRA==\r\n"
    "\t-----END CERTIFICATE-----\r\n"
    "\r\n";
-  test_simple(dumbfuck2, 0);
+  test_simple(dumbfuck2, HPE_OK);

 #if 0
  // NOTE(Wed Nov 18 11:57:27 CET 2009) this seems okay. we just read body
--- a/deps/libeio/CMakeLists.txt
+++ b/deps/libeio/CMakeLists.txt
@@ -1,26 +0,0 @@
-include(CheckFunctionExists)
-include(FindThreads)
-
-if(!${CMAKE_USE_PTHREADS_INIT})
-    message(FATAL_ERROR "Unable to find pthreads")
-endif()
-
-add_definitions(-DHAVE_CONFIG_H=1 -D_GNU_SOURCE)
-
-check_function_exists(futimes HAVE_FUTIMES)
-check_function_exists(readahead HAVE_READAHEAD)
-check_function_exists(fdatasync HAVE_FDATASYNC)
-check_function_exists(pread HAVE_PREAD)
-check_function_exists(pwrite HAVE_PWRITE)
-check_function_exists(sendfile HAVE_SENDFILE)
-check_function_exists(sync_file_range HAVE_SYNC_FILE_RANGE)
-
-if(${HAVE_PREAD} AND ${HAVE_PWRITE})
-   set(HAVE_PREADWRITE 1)
-endif()
-
-configure_file(config.h.cmake ${PROJECT_BINARY_DIR}/deps/libeio/config.h)
-include_directories(${PROJECT_BINARY_DIR}/deps/libeio)
-
-add_library(eio eio.c)
-target_link_libraries(eio ${CMAKE_THREAD_LIBS_INIT})
--- a/deps/libeio/Changes
+++ b/deps/libeio/Changes
@@ -1,35 +0,0 @@
-Revision history for libeio
-
-TODO: maybe add mincore support? available on at least darwin, solaris, linux, freebsd
-TODO: openbsd requites stdint.h for intptr_t - why posix?
-
-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.
-        - eio_set_max_polltime did not properly convert time to ticks.
-        - tentatively support darwin in sendfile.
-        - fix freebsd/darwin sendfile.
-        - also use sendfile emulation for ENOTSUP and EOPNOTSUPP
-          error codes.
-        - add OS-independent EIO_MT_* and EIO_MS_* flag enums.
-        - add eio_statvfs/eio_fstatvfs.
-        - add eio_mlock/eio_mlockall and OS-independent MCL_* flag enums.
-        - no longer set errno to 0 before making syscalls, this only lures
-          people into the trap of believing errno shows success or failure.
-        - "fix" demo.c so that it works as non-root.
-        - suppoert utimes seperately from futimes, as some systems have
-          utimes but not futimes.
-        - use _POSIX_MEMLOCK_RANGE for mlock.
-        - do not (errornously) overwrite CFLAGS in configure.ac.
-
--- 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.cmake
+++ b/deps/libeio/config.h.cmake
@@ -1,17 +0,0 @@
-/* futimes(2) is available */
-#cmakedefine HAVE_FUTIMES 1
-
-/* readahead(2) is available (linux) */
-#cmakedefine HAVE_READAHEAD 1
-
-/* fdatasync(2) is available */
-#cmakedefine HAVE_FDATASYNC 1
-
-/* pread(2) and pwrite(2) are available */
-#cmakedefine HAVE_PREADWRITE 1
-
-/* sendfile(2) is available and supported */
-#cmakedefine HAVE_SENDFILE 1
-
-/* sync_file_range(2) is available */
-#cmakedefine HAVE_SYNC_FILE_RANGE 1
--- 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 enable 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/wscript
+++ b/deps/libeio/wscript
@@ -1,129 +0,0 @@
-import Options
-import sys
-
-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)
-  if sys.platform.startswith("cygwin"):
-    conf.check_cc(lib="pthread", header_name="unistd.h", function_name="pthread_atfork", mandatory=True)
-  elif sys.platform.startswith("win32"):
-    conf.check_cc(lib="pthread", header_name="pthread.h", function_name="pthread_atfork")
-  else:
-    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__ || defined(__APPLE__)
-    # 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 __APPLE__
-       res = sendfile (fd, fd, offset, &offset, 0, 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")
-  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/libev/CMakeLists.txt
+++ b/deps/libev/CMakeLists.txt
@@ -1,37 +0,0 @@
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-include(CheckLibraryExists)
-
-#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${PROJECT_BINARY_DIR}/deps/libev)
-add_definitions(-DHAVE_CONFIG_H=1 -DEV_MULTIPLICITY=0)
-
-check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
-check_include_files(sys/epoll.h HAVE_SYS_EPOLL_H)
-check_include_files(sys/event.h HAVE_SYS_EVENT_H)
-check_include_files(sys/queue.h HAVE_SYS_QUEUE_H)
-check_include_files(port.h HAVE_PORT_H)
-check_include_files(poll.h HAVE_POLL_H)
-check_include_files(sys/select.h HAVE_SYS_SELECT_H)
-check_include_files(sys/eventfd.h HAVE_SYS_EVENTFD_H)
-
-check_function_exists(inotify_init HAVE_INOTIFY_INIT)
-check_function_exists(epoll_ctl HAVE_EPOLL_CTL)
-check_function_exists(kqueue HAVE_KQUEUE)
-check_function_exists(port_create HAVE_PORT_CREATE)
-check_function_exists(poll HAVE_POLL)
-check_function_exists(select HAVE_SELECT)
-check_function_exists(eventfd HAVE_EVENTFD)
-check_function_exists(nanosleep HAVE_NANOSLEEP)
-
-# check first without rt
-check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
-
-check_library_exists(rt clock_gettime "" HAVE_LIBRT)
-# then check with rt
-check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
-
-check_library_exists(m ceil "" HAVE_LIBM)
-
-configure_file(config.h.cmake ${PROJECT_BINARY_DIR}/deps/libev/config.h)
-add_library (ev ev.c)
--- a/deps/libev/README.embed
+++ b/deps/libev/README.embed
@@ -1,3 +0,0 @@
-This file is now included in the main libev documentation, see
-
-   http://cvs.schmorp.de/libev/ev.html
--- a/deps/libev/Symbols.ev
+++ b/deps/libev/Symbols.ev
@@ -1,72 +0,0 @@
-ev_async_send
-ev_async_start
-ev_async_stop
-ev_backend
-ev_check_start
-ev_check_stop
-ev_child_start
-ev_child_stop
-ev_clear_pending
-ev_default_destroy
-ev_default_fork
-ev_default_loop_init
-ev_default_loop_ptr
-ev_embed_start
-ev_embed_stop
-ev_embed_sweep
-ev_embeddable_backends
-ev_feed_event
-ev_feed_fd_event
-ev_feed_signal_event
-ev_fork_start
-ev_fork_stop
-ev_idle_start
-ev_idle_stop
-ev_invoke
-ev_invoke_pending
-ev_io_start
-ev_io_stop
-ev_loop
-ev_loop_count
-ev_loop_depth
-ev_loop_destroy
-ev_loop_fork
-ev_loop_new
-ev_loop_verify
-ev_now
-ev_now_update
-ev_once
-ev_pending_count
-ev_periodic_again
-ev_periodic_start
-ev_periodic_stop
-ev_prepare_start
-ev_prepare_stop
-ev_recommended_backends
-ev_ref
-ev_resume
-ev_set_allocator
-ev_set_invoke_pending_cb
-ev_set_io_collect_interval
-ev_set_loop_release_cb
-ev_set_syserr_cb
-ev_set_timeout_collect_interval
-ev_set_userdata
-ev_signal_start
-ev_signal_stop
-ev_sleep
-ev_stat_start
-ev_stat_stat
-ev_stat_stop
-ev_supported_backends
-ev_suspend
-ev_time
-ev_timer_again
-ev_timer_remaining
-ev_timer_start
-ev_timer_stop
-ev_unloop
-ev_unref
-ev_userdata
-ev_version_major
-ev_version_minor
--- a/deps/libev/Symbols.event
+++ b/deps/libev/Symbols.event
@@ -1,21 +0,0 @@
-event_active
-event_add
-event_base_dispatch
-event_base_free
-event_base_loop
-event_base_loopexit
-event_base_once
-event_base_priority_init
-event_base_set
-event_del
-event_dispatch
-event_get_method
-event_get_version
-event_init
-event_loop
-event_loopexit
-event_once
-event_pending
-event_priority_init
-event_priority_set
-event_set
--- a/deps/libev/config.h.cmake
+++ b/deps/libev/config.h.cmake
@@ -1,65 +0,0 @@
-/* Define to 1 if you have the `clock_gettime' function. */
-#cmakedefine HAVE_CLOCK_GETTIME 1
-
-/* "use syscall interface for clock_gettime" */
-#cmakedefine HAVE_CLOCK_SYSCALL 1
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-#cmakedefine HAVE_EPOLL_CTL 1
-
-/* Define to 1 if you have the `eventfd' function. */
-#cmakedefine HAVE_EVENTFD 1
-
-/* Define to 1 if you have the `inotify_init' function. */
-#cmakedefine HAVE_INOTIFY_INIT 1
-
-/* Define to 1 if you have the `kqueue' function. */
-#cmakedefine HAVE_KQUEUE 1
-
-/* Define to 1 if you have the `m' library (-lm). */
-#cmakedefine HAVE_LIBM 1
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the `nanosleep' function. */
-#cmakedefine HAVE_NANOSLEEP 1
-
-/* Define to 1 if you have the `poll' function. */
-#cmakedefine HAVE_POLL 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#cmakedefine HAVE_POLL_H 1
-
-/* Define to 1 if you have the `port_create' function. */
-#cmakedefine HAVE_PORT_CREATE 1
-
-/* Define to 1 if you have the <port.h> header file. */
-#cmakedefine HAVE_PORT_H 1
-
-/* Define to 1 if you have the `select' function. */
-#cmakedefine HAVE_SELECT 1
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#cmakedefine HAVE_SYS_EPOLL_H 1
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-#cmakedefine HAVE_SYS_EVENTFD_H 1
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-#cmakedefine HAVE_SYS_EVENT_H 1
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-#cmakedefine HAVE_SYS_INOTIFY_H 1
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-#cmakedefine HAVE_SYS_QUEUE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#cmakedefine HAVE_SYS_SELECT_H 1
-
-/* Name of package */
-#define PACKAGE "libev"
-
-/* Version number of package */
-#define VERSION "3.9"
--- a/deps/libev/event_compat.h
+++ b/deps/libev/event_compat.h
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
- * Copyright (c) 2008      Marc Alexander Lehmann <libev@schmorp.de>
- * 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. 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.
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _WIN32
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# undef WIN32_LEAN_AND_MEAN
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-#else
-# include <sys/types.h>
-# include <sys/time.h>
-# include <inttypes.h>
-#endif
-
-#include <stdarg.h>
-
-/* Fix so that ppl dont have to run with <sys/queue.h> */
-#ifndef TAILQ_ENTRY
-#define _EVENT_DEFINED_TQENTRY
-#define TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-#endif /* !TAILQ_ENTRY */
-#ifndef RB_ENTRY
-#define _EVENT_DEFINED_RBENTRY
-#define RB_ENTRY(type)							\
-struct {								\
-	struct type *rbe_left;		/* left element */		\
-	struct type *rbe_right;		/* right element */		\
-	struct type *rbe_parent;	/* parent element */		\
-	int rbe_color;			/* node color */		\
-}
-#endif /* !RB_ENTRY */
-
-/*
- * Key-Value pairs.  Can be used for HTTP headers but also for
- * query argument parsing.
- */
-struct evkeyval {
-	TAILQ_ENTRY(evkeyval) next;
-
-	char *key;
-	char *value;
-};
-
-#ifdef _EVENT_DEFINED_TQENTRY
-#undef TAILQ_ENTRY
-struct event_list;
-struct evkeyvalq;
-#undef _EVENT_DEFINED_TQENTRY
-#else
-TAILQ_HEAD (event_list, event);
-TAILQ_HEAD (evkeyvalq, evkeyval);
-#endif /* _EVENT_DEFINED_TQENTRY */
-#ifdef _EVENT_DEFINED_RBENTRY
-#undef RB_ENTRY
-#undef _EVENT_DEFINED_RBENTRY
-#endif /* _EVENT_DEFINED_RBENTRY */
-
-struct eventop {
-	char *name;
-	void *(*init)(struct event_base *);
-	int (*add)(void *, struct event *);
-	int (*del)(void *, struct event *);
-	int (*recalc)(struct event_base *, void *, int);
-	int (*dispatch)(struct event_base *, void *, struct timeval *);
-	void (*dealloc)(struct event_base *, void *);
-};
-
-/* These functions deal with buffering input and output */
-
-struct evbuffer {
-	u_char *buffer;
-	u_char *orig_buffer;
-
-	size_t misalign;
-	size_t totallen;
-	size_t off;
-
-	void (*cb)(struct evbuffer *, size_t, size_t, void *);
-	void *cbarg;
-};
-
-/* Just for error reporting - use other constants otherwise */
-#define EVBUFFER_READ		0x01
-#define EVBUFFER_WRITE		0x02
-#define EVBUFFER_EOF		0x10
-#define EVBUFFER_ERROR		0x20
-#define EVBUFFER_TIMEOUT	0x40
-
-struct bufferevent;
-typedef void (*evbuffercb)(struct bufferevent *, void *);
-typedef void (*everrorcb)(struct bufferevent *, short what, void *);
-
-struct event_watermark {
-	size_t low;
-	size_t high;
-};
-
-struct bufferevent {
-	struct event ev_read;
-	struct event ev_write;
-
-	struct evbuffer *input;
-	struct evbuffer *output;
-
-	struct event_watermark wm_read;
-	struct event_watermark wm_write;
-
-	evbuffercb readcb;
-	evbuffercb writecb;
-	everrorcb errorcb;
-	void *cbarg;
-
-	int timeout_read;	/* in seconds */
-	int timeout_write;	/* in seconds */
-
-	short enabled;	/* events that are currently enabled */
-};
-
-struct bufferevent *bufferevent_new(int fd,
-    evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg);
-int bufferevent_base_set(struct event_base *base, struct bufferevent *bufev);
-int bufferevent_priority_set(struct bufferevent *bufev, int pri);
-void bufferevent_free(struct bufferevent *bufev);
-int bufferevent_write(struct bufferevent *bufev, const void *data, size_t size);
-int bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf);
-size_t bufferevent_read(struct bufferevent *bufev, void *data, size_t size);
-int bufferevent_enable(struct bufferevent *bufev, short event);
-int bufferevent_disable(struct bufferevent *bufev, short event);
-void bufferevent_settimeout(struct bufferevent *bufev,
-    int timeout_read, int timeout_write);
-
-#define EVBUFFER_LENGTH(x)	(x)->off
-#define EVBUFFER_DATA(x)	(x)->buffer
-#define EVBUFFER_INPUT(x)	(x)->input
-#define EVBUFFER_OUTPUT(x)	(x)->output
-
-struct evbuffer *evbuffer_new(void);
-void evbuffer_free(struct evbuffer *);
-int evbuffer_expand(struct evbuffer *, size_t);
-int evbuffer_add(struct evbuffer *, const void *, size_t);
-int evbuffer_remove(struct evbuffer *, void *, size_t);
-char *evbuffer_readline(struct evbuffer *);
-int evbuffer_add_buffer(struct evbuffer *, struct evbuffer *);
-int evbuffer_add_printf(struct evbuffer *, const char *fmt, ...);
-int evbuffer_add_vprintf(struct evbuffer *, const char *fmt, va_list ap);
-void evbuffer_drain(struct evbuffer *, size_t);
-int evbuffer_write(struct evbuffer *, int);
-int evbuffer_read(struct evbuffer *, int, int);
-u_char *evbuffer_find(struct evbuffer *, const u_char *, size_t);
-void evbuffer_setcb(struct evbuffer *, void (*)(struct evbuffer *, size_t, size_t, void *), void *);
-
-/* 
- * Marshaling tagged data - We assume that all tags are inserted in their
- * numeric order - so that unknown tags will always be higher than the
- * known ones - and we can just ignore the end of an event buffer.
- */
-
-void evtag_init(void);
-
-void evtag_marshal(struct evbuffer *evbuf, uint32_t tag, const void *data,
-    uint32_t len);
-
-void encode_int(struct evbuffer *evbuf, uint32_t number);
-
-void evtag_marshal_int(struct evbuffer *evbuf, uint32_t tag, uint32_t integer);
-
-void evtag_marshal_string(struct evbuffer *buf, uint32_t tag,
-    const char *string);
-
-void evtag_marshal_timeval(struct evbuffer *evbuf, uint32_t tag,
-    struct timeval *tv);
-
-int evtag_unmarshal(struct evbuffer *src, uint32_t *ptag, struct evbuffer *dst);
-int evtag_peek(struct evbuffer *evbuf, uint32_t *ptag);
-int evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength);
-int evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength);
-int evtag_consume(struct evbuffer *evbuf);
-
-int evtag_unmarshal_int(struct evbuffer *evbuf, uint32_t need_tag,
-    uint32_t *pinteger);
-
-int evtag_unmarshal_fixed(struct evbuffer *src, uint32_t need_tag, void *data,
-    size_t len);
-
-int evtag_unmarshal_string(struct evbuffer *evbuf, uint32_t need_tag,
-    char **pstring);
-
-int evtag_unmarshal_timeval(struct evbuffer *evbuf, uint32_t need_tag,
-    struct timeval *ptv);
-
-#ifdef __cplusplus
-}
-#endif
--- a/deps/libev/import_libevent
+++ b/deps/libev/import_libevent
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-LE=../libevent-1.4.3-stable
-
-if ! [ -e evbuffer.c ]; then
-   echo do not run this programm unless you know what you are doing
-   exit 1
-fi
-
-# this program combines libev and libevent into a single package
-
-cvs update -AdP libev
-rsync -avP libev/. . --exclude CVS
-
-rm -f configure.ac
-
-cp $LE/evdns.h .
-
-perl -i -pe 's%^/.libevent-include./%#include "event_compat.h"%' event.h
-
-perl -ne '
-   s/\s+char buf\[64\];/\tchar buf[96];/;
-   if (/#include "event.h"/) {
-      print "#ifndef EV_STANDALONE\n$_#endif\n";
-      next;
-   }
-   if (/#include "misc.h"/) {
-      print "#ifndef EV_STANDALONE\n$_#endif\n";
-      next;
-   }
-   if (/#include "(unistd.h|sys\/time.h)"/) {
-      print "#ifndef WIN32\n$_#endif\n";
-      next;
-   }
-   next if /#include "log.h"/;
-
-   print;
-' <$LE/evdns.c >evdns.c
-
-cp $LE/autogen.sh .
-cp $LE/epoll_sub.c .
-cp $LE/evbuffer.c .
-cp $LE/buffer.c .
-cp $LE/evhttp.h .
-cp $LE/evutil.h .
-cp $LE/evutil.c .
-cp $LE/event-config.h .
-cp $LE/event-internal.h .
-cp $LE/evrpc.h .
-cp $LE/evrpc.c .
-cp $LE/evrpc-internal.h .
-cp $LE/http.c .
-cp $LE/event_tagging.c .
-cp $LE/http-internal.h .
-cp $LE/strlcpy-internal.h .
-cp $LE/log.c .
-cp $LE/log.h .
-cp $LE/strlcpy.c .
-rsync -a $LE/WIN32* $LE/sample $LE/test $LE/compat . --del
-#rename 's/libevent/libev/' WIN32-Prj/lib*
-cp $LE/aclocal.m4 .
-#cp $LE/acconfig.h .
-cp $LE/config.h.in .
-cp $LE/event_rpcgen.py .
-cp $LE/*.3 .
-
-#perl -i -pe 's/libevent/libev/g' sample/Makefile.am
-#perl -i -pe 's/libevent/libev/g' test/Makefile.am
-
-perl -i -pe 's/#include <event.h>$/#include "event.h"/' test/*.c
-
-perl -i -ne '
-   next if /"event-internal.h"/;
-   s/base\d?->sig.ev_signal_added/0/;
-   s/base\d?->sig.ev_signal_pair\[0\]/-1/;
-   s/base->sig.evsignal_caught/0/;
-   next if /^\ttest_signal_(dealloc|pipeloss|switchbase|assert|restore)\(\)/;
-   next if /^\ttest_simplesignal\(\)/; # non-default-loop
-   next if /^\ttest_immediatesignal\(\)/; # non-default-loop
-   next if /test_priorities\(\d\)/;
-   print;
-' test/regress.c
-
-perl -ne '
-   s/\bmin_heap.h\b//g;
-   s/\bsignal.c\b//g;
-   s/\bevport.c\b//g;
-   s/\bkqueue.c\b//g;
-   s/\bdevpoll.c\b//g;
-   s/\brtsig.c\b//g;
-   s/\bselect.c\b//g;
-   s/\bpoll.c\b//g;
-   s/\bepoll.c\b//g;
-   s/\bepoll_sub.c\b//g;
-   s/\bevent-internal.h\b//g;
-   s/\bevsignal.h\b//g;
-   s/^(man_MANS\s*=)/$1 ev.3 /;
-   s/^(EXTRA_DIST\s*=)/$1 libev.m4 ev.h ev_vars.h ev_wrap.h event_compat.h ev++.h ev_epoll.c ev_select.c ev_poll.c ev_kqueue.c ev_port.c ev_win32.c ev.3 ev.pod /;
-   s/^(include_HEADERS\s*=)/$1 ev.h event_compat.h ev++.h /;
-   s/^(CORE_SRC\s*=)/$1 ev.c /;
-   s/^(SYS_LIBS\s*=)/$1 -lm /;
-   #s/libevent/libev/g;
-   print;
-' <$LE/Makefile.am >Makefile.am
-
-perl -ne '
-   #s/-Wall/-Wall -Wno-comment -Wunused-function -Wno-unused-value/;
-   s/-Wall//g;
-   #s/libevent/libev/g;
-   #VERSION
-   s/AM_INIT_AUTOMAKE\s*\(.*,(.*)\)/AM_INIT_AUTOMAKE(libevent-$1+libev,3.1)/;
-   s/AC_LIBOBJ\(select\)/: ;/g;
-   s/AC_LIBOBJ\(poll\)/: ;/g;
-   s/AC_LIBOBJ\(kqueue\)/: ;/g;
-   s/AC_LIBOBJ\(epoll\)/: ;/g;
-   s/AC_LIBOBJ\(devpoll\)/: ;/g;
-   s/AC_LIBOBJ\(evport\)/: ;/g;
-   s/AC_LIBOBJ\(signal\)/: ;/g;
-   s/AC_LIBOBJ\(rtsig\)/: ;/g;
-   print "m4_include([libev.m4])\n" if /^AC_OUTPUT/;
-   print;
-' <$LE/configure.in >configure.in
-
-aclocal-1.7
-automake-1.7 --add-missing
-autoconf
-autoheader
-libtoolize
-CC="ccache gcc" ./configure --prefix=/opt/libev --disable-shared "$@"
-
-
--- a/deps/libev/update_ev_wrap
+++ b/deps/libev/update_ev_wrap
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-(
-   echo '#define VAR(name,decl) name'
-   echo '#define EV_GENWRAP 1'
-   cat ev_vars.h
-) | cc -E -o - - | perl -ne '
-   while (<>) {
-      push @syms, $1 if /(^\w+)/;
-   }
-   print "/* DO NOT EDIT, automatically generated by update_ev_wrap */\n",
-         "#ifndef EV_WRAP_H\n",
-         "#define EV_WRAP_H\n",
-         (map "#define $_ ((loop)->$_)\n", @syms),
-         "#else\n",
-         "#undef EV_WRAP_H\n",
-         (map "#undef $_\n", @syms),
-         "#endif\n";
-' >ev_wrap.h
--- a/deps/libev/update_symbols
+++ b/deps/libev/update_symbols
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-make ev.o event.o || exit
-
-nm ev.o           | perl -ne 'print "$1\n" if /\S+ [A-Z] (\S+)/' > Symbols.ev
-nm event.o        | perl -ne 'print "$1\n" if /\S+ [A-Z] (\S+)/' > Symbols.event
-
--- a/deps/libev/wscript
+++ b/deps/libev/wscript
@@ -1,91 +0,0 @@
-import Options
-import platform
-
-PLATFORM_IS_DARWIN = platform.platform().find('Darwin') == 0
-PLATFORM_IS_WIN32 = platform.platform().find('Win') >= 0
-
-def set_options(opt):
-  pass
-  #opt.tool_options('compiler_cc')
-
-def configure(conf):
-  print "--- libev ---"
-  #conf.check_tool('compiler_cc')
-
-  # Why to the two checks? One is to define HAVE_SYS_EPOLL_H
-  # the other is to define HAVE_EPOLL_CTL
-  # Yes, WAF is a piece of shit.
-
-  if conf.check_cc(header_name="sys/inotify.h"):
-    conf.check_cc(header_name="sys/inotify.h", function_name="inotify_init")
-
-  if conf.check_cc(header_name="sys/epoll.h"):
-    conf.check_cc(header_name="sys/epoll.h", function_name="epoll_ctl")
-
-  if conf.check_cc(header_name="port.h"):
-    conf.check_cc(header_name="port.h", function_name="port_create")
-
-  if conf.check_cc(header_name="poll.h"):
-    conf.check_cc(header_name="poll.h", function_name="poll")
-
-  conf.check_cc(header_name="sys/event.h")
-  conf.check_cc(header_name="sys/queue.h")
-  if PLATFORM_IS_DARWIN:
-    conf.check_cc(header_name="sys/event.h", function_name="kqueue")
-  else:
-    conf.check_cc(header_name="sys/queue.h", function_name="kqueue")
-
-  if PLATFORM_IS_WIN32:
-    # Windows has sys/select.h and select but this config line doesn't detect it properly
-    conf.define('HAVE_SYS_SELECT_H', 1);
-    conf.define('HAVE_SELECT', 1);
-  else:
-    if conf.check_cc(header_name="sys/select.h"):
-      conf.check_cc(header_name="sys/select.h", function_name="select")
-
-  if conf.check_cc(header_name="sys/eventfd.h"):
-    conf.check_cc(header_name="sys/eventfd.h", function_name="eventfd")
-
-
-  code = """
-      #include <syscall.h>
-      #include <time.h>
-      #include <stdio.h>
-
-      int main() {
-          struct timespec ts; 
-          int status = syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
-          return 0;
-      }
-  """
-  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
-                msg="Checking for SYS_clock_gettime")
-
-  have_librt = conf.check(lib='rt', uselib_store='RT')
-  if have_librt:
-    conf.check_cc(lib="rt", header_name="time.h", function_name="clock_gettime")
-  if PLATFORM_IS_DARWIN:
-    conf.check_cc(header_name="time.h", function_name="nanosleep")
-  elif have_librt:
-    conf.check_cc(lib="rt", header_name="time.h", function_name="nanosleep")
-
-  conf.check_cc(lib="m", header_name="math.h", function_name="ceil")
-
-  conf.define("HAVE_CONFIG_H", 1)
-  # Not using these.
-  conf.env.append_value('CPPFLAGS', ['-DEV_FORK_ENABLE=0',
-                                     '-DEV_EMBED_ENABLE=0',
-                                     '-DEV_MULTIPLICITY=0'])
-
-def build(bld):
-  libev = bld.new_task_gen("cc")
-  libev.source = 'ev.c'
-  libev.target = 'ev'
-  libev.name = 'ev'
-  libev.includes = '. ../..'
-  libev.uselib = "RT"
-  libev.install_path = None
-  if bld.env["USE_DEBUG"]:
-    libev.clone("debug");
-  bld.install_files('${PREFIX}/include/node/', 'ev.h');
-
--- a/deps/openssl/README.chromium
+++ b/deps/openssl/README.chromium
@@ -0,0 +1,48 @@
+Name: openssl
+URL: http://openssl.org/source/
+Version: 0.9.8o
+License: BSDish
+License File: openssl/LICENSE
+
+Description:
+This is OpenSSL, the standard SSL/TLS library, which is used only for testing.
+It's an unmodified, upstream source except for the patches listed below.
+
+
+Patches are applied in this order:
+
+missing_stddef.patch
+
+Add stddef.h to header files which use size_t, otherwise apps that include
+those headers get compiler errors.
+
+
+handshake_cutthrough.patch
+
+Enables SSL3+ clients to send application data immediately following the
+Finished message even when negotiating full-handshakes.  With this patch,
+clients can negotiate SSL connections in 1-RTT even when performing
+full-handshakes.
+
+
+next_proto_neg.patch
+
+Adds next-protocol-negotation support:
+  http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-00
+
+EXPERIMENTAL: this patches uses extension and handshake numbers that are not
+assigned by IANA.
+
+This patch implements server and client side support. Additionally, it includes
+code that assumes the structure of the 'opaque' protocol strings in the draft.
+
+
+snap_start.patch
+
+Adds server-side support for Snap Start. This allows for 0-RTT handshakes in
+the case that the application protocol involves the client side speaking first.
+
+http://tools.ietf.org/html/draft-agl-tls-snapstart-00
+
+EXPERIMENTAL: this patches uses an extension number that is not assigned by
+IANA.
--- a/Show More
+++ b/Show More