Bump version to v0.3.2

Remove toJSON usage - it was removed from V8
Upgrade V8 to 3.0.3
2026-04-28 03:01:10 -04:00 · 2010-12-17 09:51:48 -08:00 · 2010-12-17 09:50:41 -08:00 · 2010-12-17 09:47:55 -08:00 · 2010-12-17 09:06:31 -08:00 · 2010-12-16 18:41:13 -08:00
1498 changed files with 437680 additions and 92285 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@ tags
 .lock-wscript
 *.pyc
 doc/api.xml
-doc/api.html
-doc/changelog.html
-doc/node.1
+tools/nodejs.pc
+test/fixtures/hello.txt
+tmp/
 node
 node_g
+*.swp
+.benchmark_reports
--- a/99
+++ b/99
@@ -10,7 +10,7 @@ Jeff Smick <sprsquish@gmail.com>
 Jon Crosby <jon@joncrosby.me>
 Felix Geisendörfer <felix@debuggable.com>
 Ray Morgan <rmorgan@zappos.com>
-Jérémy Lal <holisme@gmail.com>
+Jérémy Lal <kapouer@melix.org>
 Isaac Z. Schlueter <i@izs.me>
 Brandon Beacher <brandon.beacher@gmail.com>
 Tim Caswell <tim@creationix.com>
@@ -22,11 +22,11 @@ Rhys Jones <rhys@wave.to>
 Jan Lehnardt <jan@apache.org>
 Simon Willison <simon@simonwillison.net>
 Chew Choon Keat <choonkeat@gmail.com>
-Jed Schmidt <tr@nslator.jp>
+Jered Schmidt <tr@nslator.jp>
 Michaeljohn Clement <inimino@inimino.org>
 Karl Guertin <grayrest@gr.ayre.st>
 Xavier Shay <xavier@rhnh.net>
-Christopher Lenz <chris@lamech.local>
+Christopher Lenz <cmlenz@gmail.com>
 TJ Holowaychuk <tj@vision-media.ca>
 Johan Dahlberg <jfd@distrop.com>
 Simon Cornelius P. Umacob <simoncpu@gmail.com>
@@ -34,16 +34,17 @@ Ryan McGrath <ryan@venodesigns.net>
 Rasmus Andersson <rasmus@notion.se>
 Micheil Smith <micheil@brandedcode.com>
 Jonas Pfenniger <jonas@pfenniger.name>
+David Sklar <david.sklar@gmail.com>
 Charles Lehner <celehner1@gmail.com>
 Elliott Cable <me@ell.io>
 Benjamin Thomas <benjamin@benjaminthomas.org>
-Vanilla Hsu <v@fatpipi.com>
+San-Tai Hsu <v@fatpipi.com>
 Ben Williamson <benw@pobox.com>
 Joseph Pecoraro <joepeck02@gmail.com>
 Erich Ocean <erich.ocean@me.com>
 Alexis Sellier <self@cloudhead.net>
 Blaine Cook <romeda@gmail.com>
-Standa Opichal <opichals@gmail.com>
+Stanislav Opichal <opichals@gmail.com>
 Aaron Heckmann <aaron.heckmann@gmail.com>
 Mikeal Rogers <mikeal.rogers@gmail.com>
 Matt Brubeck <mbrubeck@limpet.net>
@@ -58,8 +59,92 @@ Arlo Breault <arlolra@gmail.com>
 Kris Kowal <kris.kowal@cixar.com>
 Jacek Becela <jacek.becela@gmail.com>
 Rob Ellis <kazoomer@gmail.com>
-Tim-Smart <timehAndGod@gmail.com>
+Tim Smart <timehAndGod@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
 Krishna Rajendran <krishna@emptybox.org>
-pyrotechnick <pyrotechnick@feistystudios.com>
+Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Scott Taylor <scott@railsnewbie.com>
 Carson McDonald <carson@ioncannon.net>
+Matt Ranney <mjr@ranney.com>
+James Herdman <james.herdman@gmail.com>
+Julian Lamb <thepurlieu@gmail.com>
+Brian Hammond <brian@fictorial.com>
+Mathias Pettersson <mape@mape.me>
+Trevor Blackwell <tlb@tlb.org>
+Thomas Lee <thomas.lee@shinetech.com>
+Daniel Berger <code+node@dpbis.net>
+Paulo Matias <paulo.matias@usp.br>
+Peter Griess <pg@std.in>
+Jonathan Knezek <jdknezek@gmail.com>
+Jonathan Rentzsch <jwr.git@redshed.net>
+Ben Noordhuis <info@bnoordhuis.nl>
+Elijah Insua <tmpvar@gmail.com>
+Andrew Johnston <apjohnsto@gmail.com>
+Brian White <mscdex@mscdex.net>
+Aapo Laitinen <aapo.laitinen@iki.fi>
+Sam Hughes <sam@samuelhughes.com>
+Orlando Vazquez <ovazquez@gmail.com>
+Raffaele Sena <raff367@gmail.com>
+Brian McKenna <brian@brianmckenna.org>
+Paul Querna <pquerna@apache.org>
+Ben Lowery <ben@blowery.org>
+Peter Dekkers <soderblom.peter@gmail.com>
+David Siegel <david@artcom.de>
+Marshall Culpepper <marshall.law@gmail.com>
+Ruben Rodriguez <cha0s@therealcha0s.net>
+Dmitry Baranovskiy <Dmitry@Baranovskiy.com>
+Blake Mizerany <blake.mizerany@gmail.com>
+Jerome Etienne <jerome.etienne@gmail.com>
+Dmitriy Shalashov <skaurus@gmail.com>
+Adam Wiggins <adam@heroku.com>
+Rick Olson <technoweenie@gmail.com>
+David Siegel <david.siegel@artcom.de>
+Sergey Kzyzhanovsky <skryzhanovsky@gmail.com>
+Marco Rogers <marco.rogers@gmail.com>
+Benjamin Fritsch <beanie@benle.de>
+Jan Kassens <jan@kassens.net>
+Robert Keizer <root@black.bluerack.ca>
+Sam Shull <brickysam26@gmail.com>
+Chandra Sekar S <chandru.in@gmail.com>
+Andrew Naylor <argon@mkbot.net>
+Benjamin Kramer <benny.kra@gmail.com>
+Danny Coates <dannycoates@gmail.com>
+Nick Stenning <nick@whiteink.com>
+Bert Belder <bertbelder@gmail.com>
+Trent Mick <trentm@gmail.com>
+Fedor Indutny <fedor.indutny@gmail.com>
+Illarionov Oleg <oleg@emby.ru>
+Aria Stewart <aredridel@nbtsc.org>
+Johan Euphrosine <proppy@aminche.com>
+Russell Haering <russellhaering@gmail.com>
+Bradley Meck <bradley.meck@gmail.com>
+Tobie Langel <tobie.langel@gmail.com>
+Tony Metzidis <tonym@tonym.us>
+Mark Nottingham <mnot@mnot.net>
+Sam Stephenson <sam@37signals.com>
+Jorge Chamorro Bieling <jorge@jorgechamorro.com>
+Evan Larkin <evan.larkin.il.com>
+Sean Coates <sean@seancoates.com>
+Tom Hughes <tom.hughes@palm.com>
+Joshua Peek <josh@joshpeek.com>
+Nathan Rajlich <nathan@tootallnate.net>
+Peteris Krumins <peteris.krumins@gmail.com>
+AJ ONeal <coolaj86@gmail.com>
+Sami Samhuri <sami.samhuri@gmail.com>
+Nikhil Marathe <nsm.nikhil@gmail.com>
+Vitali Lovich <vitali.lovich@palm.com>
+Stéphan Kochen <stephan@kochen.nl>
+Oleg Efimov <efimovov@gmail.com>
+Guillaume Tuton <guillaume@tuton.fr>
+Tim Cooijmans <tim@aapopfiets.nl>
+Dan Søndergaard <dan1990@gmail.com>
+Silas Sewell <silas@sewell.ch>
+Wade Simmons <wade@wades.im>
+Daniel Gröber <darklord@darkboxed.org>
+Travis Swicegood <development@domain51.com>
+Oleg Slobodskoi <oleg008@gmail.com>
+Jeremy Martin <jmar777@gmail.com>
+Michael W <gcr@sneakygcr.net>
+Sean Braithwaite <brapse@gmail.com>
+Anders Conbere <aconbere@gmail.com>
+Devin Torres <devin@devintorres.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,94 @@
+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
@@ -0,0 +1,7 @@
+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/465
+++ b/465
@@ -1,4 +1,449 @@
-2010.04.15, Version 0.1.91
+2010.12.16, Version 0.3.2 (unstable)
+
+* Rip out the old (broken) TLS implementation introduce new tested
+  implementation and API. See docs. HTTPS not supported in this release.
+
+* Introduce 'os' and 'tty' modules.
+
+* Callback parameters for socket.write() and socket.connect().
+
+* Support CNAME lookups in DNS module. (Ben Noordhuis)
+
+* cmake support (Tom Hughes)
+
+* 'make lint'
+
+* oprofile support (./configure --oprofile)
+
+* Lots of bug fixes, including:
+  - Memory leak in ChildProcess:Spawn(). (Tom Hughes)
+  - buffer.slice(0, 0)
+  - Global variable leaks
+  - clearTimeouts calling multiple times (Michael W)
+  - utils.inspect's detection of circular structures (Tim Cooijmans)
+  - Apple's threaded write()s bug (Jorge Chamorro Bieling)
+  - Make sure raw mode is disabled when exiting a terminal-based REPL.
+    (Brian White)
+
+* Deprecate process.compile, process.ENV
+
+* Upgrade V8 to 3.0.3, upgrade http-parser.
+
+
+2010.11.16, Version 0.3.1 (unstable), ce9a54aa1fbf709dd30316af8a2f14d83150e947
+
+* TLS improvments (Paul Querna)
+  - Centralize error handling in SecureStream
+  - Add SecurePair for handling of a ssl/tls stream.
+
+* New documentation organization (Micheil Smith)
+
+* allowHalfOpen TCP connections disabled by default.
+
+* Add C++ API for constructing fast buffer from string
+
+* Move idle timers into its own module
+
+* Gracefully handle EMFILE and server.maxConnections
+
+* make "node --eval" eval in the global scope.
+  (Jorge Chamorro Bieling)
+
+* Let exit listeners know the exit code (isaacs)
+
+* Handle cyclic links smarter in fs.realpath (isaacs)
+
+* Remove node-repl (just use 'node' without args)
+
+* Rewrite libeio After callback to use req->result instead of req->errorno
+  for error checking (Micheil Smith)
+
+* Remove warning about deprecating 'sys' - too aggressive
+
+* Make writes to process.env update the real environment. (Ben Noordhuis)
+
+* Set FD_CLOEXEC flag on stdio FDs before spawning. (Guillaume Tuton)
+
+* Move ev_loop out of javascript
+
+* Switch \n with \r\n for all strings printed out.
+
+* Added support for cross compilation (Rasmus Andersson)
+
+* Add --profile flag to configure script, enables gprof profiling.
+  (Ben Noordhuis)
+
+* writeFileSync could exhibit pathological behavior when a buffer
+  could not be written to the file in a single write() call.
+
+* new path.join behavior (isaacs)
+  - Express desired path.join behavior in tests.
+  - Update fs.realpath to reflect new path.join behavior
+  - Update url.resolve() to use new path.join behavior.
+
+* API: Move process.binding('evals') to require('vm')
+
+* Fix V8 build on Cygwin (Bert Belder)
+
+* Add ref to buffer during fs.write and fs.read
+
+* Fix segfault on test-crypto
+
+* Upgrade http-parser to latest and V8 to 2.5.3
+
+
+2010.10.23, Version 0.3.0 (unstable) 1582cfebd6719b2d2373547994b3dca5c8c569c0
+
+* Bugfix: Do not spin on aceept() with EMFILE
+
+* Improvments to readline.js (Trent Mick, Johan Euphrosine, Brian White)
+
+* Safe constructors (missing 'new' doesn't segfault)
+
+* Fix process.nextTick so thrown errors don't confuse it.
+  (Benjamin Thomas)
+
+* Allow Strings for ports on net.Server.listen (Bradley Meck)
+
+* fs bugfixes (Tj Holowaychuk, Tobie Langel, Marco Rogers, isaacs)
+
+* http bug fixes (Fedor Indutny, Mikeal Rogers) 
+
+* Faster buffers; breaks C++ API (Tim-Smart, Stéphan Kochen)
+
+* crypto, tls improvements (Paul Querna)
+
+* Add lfs flags to node addon script
+
+* Simpler querystring parsing; breaks API (Peter Griess)
+
+* HTTP trailers (Mark Nottingham)
+
+* http 100-continue support (Mark Nottingham)
+
+* Module system simplifications (Herbert Vojčík, isaacs, Tim-Smart)
+  - remove require.async
+  - remove registerExtension, add .extensions
+  - expose require.resolve
+  - expose require.cache
+  - require looks in  node_modules folders
+
+* Add --eval command line option (TJ Holowaychuk)
+
+* Commas last in sys.inspect
+
+* Constatnts moved from process object to require('constants')
+
+* Fix parsing of linux memory (Vitali Lovich)
+
+* inspect shows function names (Jorge Chamorro Bieling)
+
+* uncaughtException corner cases (Felix Geisendörfer)
+
+* TCP clients now buffer writes before connection
+
+* Rename sys module to 'util' (Micheil Smith)
+
+* Properly set stdio handlers to blocking on SIGTERM and SIGINT
+  (Tom Hughes)
+
+* Add destroy methods to HTTP messages
+
+* base64 improvements (isaacs, Jorge Chamorro Bieling)
+
+* API for defining REPL commands (Sami Samhuri)
+
+* child_process.exec timeout fix (Aaron Heckmann)
+
+* Upgrade V8 to 2.5.1, Libev to 4.00, libeio, http-parser
+
+
+2010.08.20, Version 0.2.0, 9283e134e558900ba89d9a33c18a9bdedab07cb9
+
+* process.title support for FreeBSD, Macintosh, Linux
+
+* Fix OpenSSL 100% CPU usage on error (Illarionov Oleg)
+
+* Implement net.Server.maxConnections.
+
+* Fix process.platform, add process.version.
+
+* Add --without-snapshot configure option.
+
+* Readline REPL improvements (Trent Mick)
+
+* Bug fixes.
+
+* Upgrade V8 to 2.3.8
+
+
+2010.08.13, Version 0.1.104
+
+* Various bug fixes (console, querystring, require)
+
+* Set cwd for child processes (Bert Belder)
+
+* Tab completion for readline (Trent Mick)
+
+* process.title getter/setter for OSX, Linux, Cygwin.
+	(Rasmus Andersson, Bert Belder)
+
+* Upgrade V8 to 2.3.6
+
+
+2010.08.04, Version 0.1.103, 0b925d075d359d03426f0b32bb58a5e05825b4ea
+
+* Implement keep-alive for http.Client (Mikeal Rogers)
+
+* base64 fixes. (Ben Noordhuis)
+
+* Fix --debug-brk (Danny Coates)
+
+* Don't let path.normalize get above the root. (Isaac Schlueter)
+
+* Allow signals to be used with process.on in addition to
+  process.addListener. (Brian White)
+
+* Globalize the Buffer object
+
+* Use kqueue on recent macintosh builds
+
+* Fix addrlen for unix_dgram sockets (Benjamin Kramer)
+
+* Fix stats.isDirectory() and friends (Benjamin Kramer)
+
+* Upgrade http-parser, V8 to 2.3.5
+
+
+2010.07.25, Version 0.1.102, 2a4568c85f33869c75ff43ccd30f0ec188b43eab
+
+* base64 encoding for Buffers.
+
+* Buffer support for Cipher, Decipher, Hmac, Sign and Verify
+  (Andrew Naylor)
+
+* Support for reading byte ranges from files using fs.createReadStream.
+  (Chandra Sekar)
+
+* Fix Buffer.toString() on 0-length slices. (Peter Griess)
+
+* Cache modules based on filename rather than ID (Isaac Schlueter)
+
+* querystring improvments (Jan Kassens, Micheil Smith)
+
+* Support DEL in the REPL. (Jérémy Lal)
+
+* Upgrade http-parser, upgrade V8 to 2.3.2
+
+
+2010.07.16, Version 0.1.101, 0174ceb6b24caa0bdfc523934c56af9600fa9b58
+
+* Added env to child_process.exec (Сергей Крыжановский)
+
+* Allow modules to optionally be loaded in separate contexts
+  with env var NODE_MODULE_CONTEXTS=1.
+
+* setTTL and setBroadcast for dgram (Matt Ranney)
+
+* Use execPath for default NODE_PATH, not installPrefix
+  (Isaac Schlueter)
+
+* Support of console.dir + console.assert (Jerome Etienne)
+
+* on() as alias to addListener()
+
+* Use javascript port of Ronn to build docs (Jérémy Lal)
+
+* Upgrade V8 to 2.3.0
+
+
+2010.07.03, Version 0.1.100, a6b8586e947f9c3ced180fe68c233d0c252add8b
+
+* process.execPath (Marshall Culpepper)
+
+* sys.pump (Mikeal Rogers)
+
+* Remove ini and mjsunit libraries.
+
+* Introduce console.log() and friends.
+
+* Switch order of arguments for Buffer.write (Blake Mizerany)
+
+* On overlapping buffers use memmove (Matt Ranney)
+
+* Resolve .local domains with getaddrinfo()
+
+* Upgrade http-parser, V8 to 2.2.21
+
+
+2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78 
+
+* Datagram sockets (Paul Querna)
+
+* fs.writeFile could not handle utf8 (Felix Geisendörfer)
+  and now accepts Buffers (Aaron Heckmann)
+
+* Fix crypto memory leaks.
+
+* A replacement for decodeURIComponent that doesn't throw.
+  (Isaac Schlueter)
+
+* Only concatenate some incoming HTTP headers. (Peter Griess)
+
+* Upgrade V8 to 2.2.18
+
+
+2010.06.11, Version 0.1.98, 10d8adb08933d1d4cea60192c2a31c56d896733d
+
+* Port to Windows/Cygwin (Raffaele Sena)
+
+* File descriptor passing on unix sockets. (Peter Griess)
+
+* Simple, builtin readline library. REPL is now entered by
+  executing "node" without arguments.
+
+* Add a parameter to spawn() that sets the child's stdio file
+  descriptors. (Orlando Vazquez)
+
+* Upgrade V8 to 2.2.16, http-parser fixes, upgrade c-ares to 1.7.3.
+
+
+2010.05.29, Version 0.1.97, 0c1aa36835fa6a3557843dcbc6ed6714d353a783
+
+* HTTP throttling: outgoing messages emit 'drain' and write() returns false
+  when send buffer is full.
+
+* API: readFileSync without encoding argument now returns a Buffer
+
+* Improve Buffer C++ API; addons now compile with debugging symbols.
+
+* Improvements to  path.extname() and REPL; add fs.chown().
+
+* fs.ReadStream now emits buffers, fs.readFileSync returns buffers.
+
+* Bugfix: parsing HTTP responses to HEAD requests.
+
+* Port to OpenBSD.
+
+* Upgrade V8 to 2.2.12, libeio, http-parser.
+
+
+2010.05.21, Version 0.1.96, 9514a4d5476225e8c8310ce5acae2857033bcaaa
+
+* Thrown errors in http and socket call back get bubbled up.
+
+* Add fs.fsync (Andrew Johnston)
+
+* Bugfix: signal unregistering (Jonas Pfenniger)
+
+* Added better error messages for async and sync fs calls with paths
+  (TJ Holowaychuk)
+
+* Support arrays and strings in buffer constructor.
+  (Felix Geisendörfer)
+
+* Fix errno reporting in DNS exceptions.
+
+* Support buffers in fs.WriteStream.write.
+
+* Bugfix: Safely decode a utf8 streams that are broken on a multbyte
+  character (http and net). (Felix Geisendörfer)
+
+* Make Buffer's C++ constructor public.
+
+* Deprecate sys.p()
+
+* FIX path.dirname('/tmp') => '/'. (Jonathan Rentzsch)
+
+
+2010.05.13, Version 0.1.95, 0914d33842976c2c870df06573b68f9192a1fb7a
+
+* Change GC idle notify so that it runs alongside setInterval
+
+* Install node_buffer.h on make install
+
+* fs.readFile returns Buffer by default (Tim Caswell)
+
+* Fix error reporting in child_process callbacks
+
+* Better logic for testing if an argument is a port
+
+* Improve error reporting (single line "node.js:176:9" errors)
+
+* Bugfix: Some http responses being truncated (appeared in 0.1.94)
+
+* Fix long standing net idle timeout bugs. Enable 2 minute timeout
+  by default in HTTP servers.
+
+* Add fs.fstat (Ben Noordhuis)
+
+* Upgrade to V8 2.2.9
+
+
+2010.05.06, Version 0.1.94, f711d5343b29d1e72e87107315708e40951a7826
+
+* Look in /usr/local/lib/node for modules, so that there's a way 
+  to install modules globally (Issac Schlueter)
+
+* SSL improvements (Rhys Jones, Paulo Matias)
+
+* Added c-ares headers for linux-arm (Jonathan Knezek)
+
+* Add symbols to release build
+
+* HTTP upgrade improvements, docs (Micheil Smith)
+
+* HTTP server emits 'clientError' instead of printing message
+
+* Bugfix: Don't emit 'error' twice from http.Client
+
+* Bugfix: Ignore SIGPIPE
+
+* Bugfix: destroy() instead of end() http connection at end of
+  pipeline
+
+* Bugfix: http.Client may be prematurely released back to the 
+  free pool.  (Thomas Lee)
+
+* Upgrade V8 to 2.2.8
+
+
+2010.04.29, Version 0.1.93, 557ba6bd97bad3afe0f9bd3ac07efac0a39978c1
+
+  * Fixed no 'end' event on long chunked HTTP messages
+    http://github.com/ry/node/issues/#issue/77
+
+  * Remove legacy modules http_old and tcp_old
+
+  * Support DNS MX queries (Jérémy Lal)
+
+  * Fix large socket write (tlb@tlb.org)
+
+  * Fix child process exit codes (Felix Geisendörfer)
+
+  * Allow callers to disable PHP/Rails style parameter munging in
+    querystring.stringify (Thomas Lee)
+
+  * Upgrade V8 to 2.2.6
+
+
+2010.04.23, Version 0.1.92, caa828a242f39b6158084ef4376355161c14fe34
+
+  * OpenSSL support. Still undocumented (see tests). (Rhys Jones)
+
+  * API: Unhandled 'error' events throw.
+
+  * Script class with eval-function-family in binding('evals') plus tests.
+    (Herbert Vojcik)
+
+  * stream.setKeepAlive (Julian Lamb)
+
+  * Bugfix: Force no body on http 204 and 304
+
+  * Upgrade Waf to 1.5.16, V8 to 2.2.4.2
+
+
+2010.04.15, Version 0.1.91, 311d7dee19034ff1c6bc9098c36973b8d687eaba

  * Add incoming.httpVersion

@@ -6,12 +451,12 @@

  * REPL can be run from multiple different streams. (Matt Ranney)

-  * After V8 heap is compact, don't use a timer every 2 seconds. 
+  * After V8 heap is compact, don't use a timer every 2 seconds.

-  * Improve nextTick implementation. 
+  * Improve nextTick implementation.

  * Add primative support for Upgrading HTTP connections.
-    (See commit log for docs 760bba5) 
+    (See commit log for docs 760bba5)

  * Add timeout and maxBuffer options to child_process.exec

@@ -320,7 +765,7 @@

  * Bugfix: correctly check kqueue and epoll. (Rasmus Andersson)

-  * Upgrade WAF to 1.5.10 
+  * Upgrade WAF to 1.5.10

  * Bugfix: posix.statSync() was crashing

@@ -434,12 +879,12 @@
    - __module becomes module

  * API: Many namespacing changes
-    - Move node.* into process.* 
+    - Move node.* into process.*
    - Move node.dns into module "dns"
    - Move node.fs into module "posix"
    - process is no longer the global object. GLOBAL is.

-  For more information on the API changes see: 
+  For more information on the API changes see:
    http://thread.gmane.org/gmane.comp.lang.javascript.nodejs/6
    http://thread.gmane.org/gmane.comp.lang.javascript.nodejs/14

@@ -501,7 +946,7 @@

  * Feature: Multipart stream parser (Felix Geisendörfer)

-  * API: Move node.puts(), node.exec() and others to /utils.js 
+  * API: Move node.puts(), node.exec() and others to /utils.js

  * API: Move http, tcp libraries to /http.js and /tcp.js

@@ -524,7 +969,7 @@
    whole files at once.


-2009.09.24, Version 0.1.12, 2f56ccb45e87510de712f56705598b3b4e3548ec 
+2009.09.24, Version 0.1.12, 2f56ccb45e87510de712f56705598b3b4e3548ec

  * Feature: System modules, node.libraryPaths

@@ -543,7 +988,7 @@

  * API: default to utf8 encoding for node.fs.cat()

-  * API: add node.exec() 
+  * API: add node.exec()

  * API: node.fs.read() takes a normal encoding parameter.

--- a/24
+++ b/24
@@ -3,7 +3,7 @@ maintained libraries.  The externally maintained libraries used by Node
 are:

  - v8, located under deps/v8, which is copyrighted by the Google, Inc.
-    v8 has an MIT license. 
+    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
@@ -19,7 +19,27 @@ are:
    the Massachusetts Institute of Technology; authored by Greg Hudson,
    Daniel Stenberg and others. Released under an MIT license.

-Other external libraries are my own and all use the same license as Node.
+  - 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:

--- a/127
+++ b/127
@@ -1,14 +1,21 @@
-WAF=python tools/waf-light --jobs=1
+WAF=python tools/waf-light

-all:
-	@$(WAF) build
+web_root = ryan@nodejs.org:~/web/nodejs.org/

-all-debug:
-	@$(WAF) -v build
+all: program

 all-progress:
 	@$(WAF) -p build

+program:
+	@$(WAF) --product-type=program build
+
+staticlib:
+	@$(WAF) --product-type=cstaticlib build
+
+dynamiclib:
+	@$(WAF) --product-type=cshlib build
+
 install:
 	@$(WAF) install

@@ -16,7 +23,7 @@ uninstall:
 	@$(WAF) uninstall

 test: all
-	python tools/test.py --mode=release simple
+	python tools/test.py --mode=release simple message

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

-benchmark: all
-	build/default/node benchmark/run.js
+build/default/node: all

-# http://rtomayko.github.com/ronn
-# gem install ronn
-doc: doc/node.1 doc/api.html doc/index.html doc/changelog.html
+apidoc_sources = $(wildcard doc/api/*.markdown)
+apidocs = $(addprefix build/,$(apidoc_sources:.markdown=.html))

-## HACK to give the ronn-generated page a TOC
-doc/api.html: doc/api.markdown doc/api_header.html doc/api_footer.html
-	ronn -f --html doc/api.markdown \
-	| sed "s/<h2>\(.*\)<\/h2>/<h2 id=\"\1\">\1<\/h2>/g" \
-	| cat doc/api_header.html - doc/api_footer.html > doc/api.html
+apidoc_dirs = build/doc build/doc/api/ build/doc/api/assets

-doc/changelog.html: ChangeLog
-	echo '<html><head><title>Node.js ChangeLog</title> <link rel="stylesheet" href="./pipe.css" type="text/css" /> <link rel="stylesheet" href="./pipe-quirks.css" type="text/css" /> <body><h1>Node.js ChangeLog</h1> <pre>' > doc/changelog.html
-	cat ChangeLog >> doc/changelog.html
-	echo '</pre></body></html>' >> doc/changelog.html
+apiassets = $(subst api_assets,api/assets,$(addprefix build/,$(wildcard doc/api_assets/*)))

-doc/node.1: doc/api.markdown
-	ronn --roff doc/api.markdown > doc/node.1
+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
+
+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/
+	cp $< $@
+
+build/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 $< > $@
+
+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/%:

 website-upload: doc
-	scp doc/* ryan@nodejs.org:~/tinyclouds/node/
+	scp -r build/doc/* $(web_root)
+
+docopen: build/doc/api/all.html
+	-google-chrome build/doc/api/all.html

 docclean:
-	@-rm -f doc/node.1 doc/api.html doc/changelog.html
+	-rm -rf build/doc

 clean:
-	@$(WAF) clean
-	@-find tools/ -name "*.pyc" -delete
+	$(WAF) clean
+	-find tools -name "*.pyc" | xargs rm -f

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

 check:
 	@tools/waf-light check
@@ -76,15 +111,31 @@ check:
 VERSION=$(shell git describe)
 TARNAME=node-$(VERSION)

-dist: doc/node.1 doc/api.html
-	git archive --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar
+#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 doc/api.html $(TARNAME)/doc/api.html
-	tar rf $(TARNAME).tar   \
-		$(TARNAME)/doc/node.1 \
-		$(TARNAME)/doc/api.html
-	rm -r $(TARNAME)
+	cp -r build/doc/api $(TARNAME)/doc/api
+	rm -rf $(TARNAME)/deps/v8/test # too big
+	tar -cf $(TARNAME).tar $(TARNAME)
+	rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar

-.PHONY: benchmark clean docclean dist distclean check uninstall install all test test-all website-upload
+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
@@ -0,0 +1,39 @@
+BUILD?=build
+VERBOSE?=0
+PARALLEL_JOBS?=1
+CMAKE?=cmake
+
+all: doc package
+
+$(BUILD)/Makefile:
+	mkdir $(BUILD) || exit 0
+	cd $(BUILD) && $(CMAKE) -DCMAKE_VERBOSE_MAKEFILE=$(VERBOSE) ..
+
+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/4
+++ b/4
@@ -10,9 +10,9 @@ To run the tests:
  
  make test

-To build the documentation and install it, you will need ronn:
+To build the documentation:

-  make doc install
+  make doc
 
 To read the documentation:

--- a/README.cmake
+++ b/README.cmake
@@ -0,0 +1,65 @@
+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
+
+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/34
+++ b/34
@@ -0,0 +1,34 @@
+- 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>
+
+- Add callbacks to write() on other streams (fs.WriteStream, http outgoing)
+  callbacks are already on net.Stream streams.
+- Add callback to net.Stream.connect
+- new TLS frontend api using securepair
+- "node --raw-js script.js" should bipass all Node code and load a raw V8
+  interpreter
--- a/benchmark/buffer_creation.js
+++ b/benchmark/buffer_creation.js
@@ -0,0 +1,6 @@
+SlowBuffer = require('buffer').SlowBuffer;
+
+for (var i = 0; i < 1e6; i++) {
+  b = new SlowBuffer(10);
+  b[1] = 2
+}
--- a/benchmark/fast_buffer2.js
+++ b/benchmark/fast_buffer2.js
@@ -0,0 +1,42 @@
+var SlowBuffer = require('buffer').SlowBuffer;
+var POOLSIZE = 8*1024;
+var pool;
+
+function allocPool () {
+  pool = new SlowBuffer(POOLSIZE);
+  pool.used = 0;
+}
+
+function FastBuffer (length) {
+  this.length = length;
+
+  if (length > POOLSIZE) {
+    // Big buffer, just alloc one.
+    this.parent = new Buffer(length);
+    this.offset = 0;
+  } else {
+    // Small buffer.
+    if (!pool || pool.length - pool.used < length) allocPool();
+    this.parent = pool;
+    this.offset = pool.used;
+    pool.used += length;
+  }
+
+  // HERE HERE HERE
+  SlowBuffer.makeFastBuffer(this.parent, this, this.offset, this.length);
+}
+
+exports.FastBuffer = FastBuffer;
+
+FastBuffer.prototype.get = function (i) {
+  if (i < 0 || i >= this.length) throw new Error("oob");
+  return this.parent[this.offset + i];
+};
+
+FastBuffer.prototype.set = function (i, v) {
+  if (i < 0 || i >= this.length) throw new Error("oob");
+  return this.parent[this.offset + i] = v;
+};
+
+// TODO define slice, toString, write, etc.
+// slice should not use c++
--- a/benchmark/fast_buffer2_creation.js
+++ b/benchmark/fast_buffer2_creation.js
@@ -0,0 +1,6 @@
+
+FastBuffer = require('./fast_buffer2').FastBuffer;
+for (var i = 0; i < 1e6; i++) {
+  b = new FastBuffer(10);
+  b[1] = 2;
+}
--- a/benchmark/fast_buffer_creation.js
+++ b/benchmark/fast_buffer_creation.js
@@ -0,0 +1,4 @@
+for (var i = 0; i < 1e6; i++) {
+  b = new Buffer(10);
+  b[1] = 2;
+}
--- a/benchmark/function_call/bench.js
+++ b/benchmark/function_call/bench.js
@@ -0,0 +1,43 @@
+var binding = require('./build/default/binding');
+
+c = 0 
+
+function js() {
+  return c++; //(new Date()).getTime();
+}
+
+var cxx = binding.hello;
+
+var i, N = 100000000;
+
+console.log(js());
+console.log(cxx());
+
+
+
+var start = new Date();
+for (i = 0; i < N; i++) {
+  js();
+}
+var jsDiff = new Date() - start;
+console.log(N +" JS function calls: " + jsDiff);
+
+
+var start = new Date();
+for (i = 0; i < N; i++) {
+  cxx();
+}
+var cxxDiff = new Date() - start;
+console.log(N +" C++ function calls: " + cxxDiff);
+
+function toMicro (diff) {
+  return (diff / N) * 1000000;
+}
+
+console.log("\nJS function call speed: %d microseconds", toMicro(jsDiff));
+console.log("C++ function call speed: %d microseconds", toMicro(cxxDiff));
+
+
+console.log("\nJS speedup " + (cxxDiff / jsDiff)); 
+
+
--- a/benchmark/function_call/binding.cc
+++ b/benchmark/function_call/binding.cc
@@ -0,0 +1,19 @@
+#include <v8.h>
+#include <node.h>
+#include <time.h>
+
+using namespace v8;
+
+static int c = 0;
+
+static Handle<Value> Hello(const Arguments& args) {
+  HandleScope scope;
+  //time_t tv = time(NULL);
+  return scope.Close(Integer::New(c++));
+}
+
+extern "C" void init (Handle<Object> target) {
+  HandleScope scope;
+  //target->Set(String::New("hello"), String::New("World"));
+  NODE_SET_METHOD(target, "hello", Hello);
+}
--- a/benchmark/function_call/wscript
+++ b/benchmark/function_call/wscript
@@ -0,0 +1,15 @@
+srcdir = '.'
+blddir = 'build'
+VERSION = '0.0.1'
+
+def set_options(opt):
+  opt.tool_options('compiler_cxx')
+
+def configure(conf):
+  conf.check_tool('compiler_cxx')
+  conf.check_tool('node_addon')
+
+def build(bld):
+  obj = bld.new_task_gen('cxx', 'shlib', 'node_addon')
+  obj.target = 'binding'
+  obj.source = 'binding.cc'
--- a/benchmark/http_simple.js
+++ b/benchmark/http_simple.js
@@ -1,22 +1,40 @@
 path = require("path");
+exec = require("child_process").exec;
+http = require("http");

-var puts = require("sys").puts;
+port = parseInt(process.env.PORT || 8000);

-var old = (process.argv[2] == 'old');
-
-puts('pid ' + process.pid);
-
-http = require(old ? "http_old" : 'http');
-if (old) puts('old version');
+console.log('pid ' + process.pid);

 fixed = ""
 for (var i = 0; i < 20*1024; i++) {
  fixed += "C";
 }

-stored = {};
+var uname, rev;

-http.createServer(function (req, res) {
+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 = {};
+
+var server = http.createServer(function (req, res) {
  var commands = req.url.split("/");
  var command = commands[1];
  var body = "";
@@ -26,9 +44,9 @@ http.createServer(function (req, res) {
  if (command == "bytes") {
    var n = parseInt(arg, 10)
    if (n <= 0)
-      throw "bytes called with n <= 0" 
+      throw "bytes called with n <= 0"
    if (stored[n] === undefined) {
-      puts("create stored[n]");
+      console.log("create stored[n]");
      stored[n] = "";
      for (var i = 0; i < n; i++) {
        stored[n] += "C"
@@ -36,6 +54,18 @@ http.createServer(function (req, res) {
    }
    body = stored[n];

+  } else if (command == "buffer") {
+    var n = parseInt(arg, 10)
+    if (n <= 0) throw new Error("bytes called with n <= 0");
+    if (storedBuffer[n] === undefined) {
+      console.log("create storedBuffer[n]");
+      storedBuffer[n] = new Buffer(n);
+      for (var i = 0; i < n; i++) {
+        storedBuffer[n][i] = "C".charCodeAt(0);
+      }
+    }
+    body = storedBuffer[n];
+
  } else if (command == "quit") {
    res.connection.server.close();
    body = "quitting";
@@ -43,6 +73,9 @@ 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";
@@ -50,15 +83,13 @@ http.createServer(function (req, res) {

  var content_length = body.length.toString();

-  res.writeHead( status 
-                , { "Content-Type": "text/plain"
-                  , "Content-Length": content_length
-                  }
-                );
-  if (old) {
-    res.write(body, 'ascii');
-    res.close();
-  } else {
-    res.end(body, 'ascii');
-  }
-}).listen(8000);
+  res.writeHead(status, { "Content-Type": "text/plain",
+                          "Content-Length": content_length });
+  res.end(body);
+
+});
+
+server.listen(port, function () {
+  console.log('Listening at http://127.0.0.1:'+port+'/');
+});
+
--- a/benchmark/http_simple.rb
+++ b/benchmark/http_simple.rb
@@ -7,45 +7,45 @@ end

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

 class SimpleApp
  @@responses = {}
-  
+
  def initialize
    @count = 0
  end
-  
+
  def deferred?(env)
    false
  end
-  
+
  def call(env)
    path = env['PATH_INFO'] || env['REQUEST_URI']
    commands = path.split('/')
-    
+
    @count += 1
    if commands.include?('periodical_activity') and @count % 10 != 1
      return [200, {'Content-Type'=>'text/plain'}, "quick response!\r\n"]
    end
-    
+
    if commands.include?('fibonacci')
      n = commands.last.to_i
      raise "fibonacci called with n <= 0" if n <= 0
      body = (1..n).to_a.map { |i| fib(i).to_s }.join(' ')
      status = 200
-    
+
    elsif commands.include?('wait')
      n = commands.last.to_f
      raise "wait called with n <= 0" if n <= 0
      wait(n)
      body = "waited about #{n} seconds"
      status = 200
-    
+
    elsif commands.include?('bytes')
      n = commands.last.to_i
      raise "bytes called with n <= 0" if n <= 0
@@ -56,17 +56,17 @@ class SimpleApp
      n = 20 * 1024;
      body = @@responses[n] || "C"*n
      status = 200
-      
+
    elsif commands.include?('test_post_length')
      input_body = ""
      while chunk = env['rack.input'].read(512)
-        input_body << chunk 
+        input_body << chunk
      end
      if env['CONTENT_LENGTH'].to_i == input_body.length
        body = "Content-Length matches input length"
        status = 200
      else
-        body = "Content-Length doesn't matches input length! 
+        body = "Content-Length doesn't matches input length!
          content_length = #{env['CONTENT_LENGTH'].to_i}
          input_body.length = #{input_body.length}"
        status = 500
@@ -75,7 +75,7 @@ class SimpleApp
      status = 404
      body = "Undefined url"
    end
-    
+
    body += "\r\n"
    headers = {'Content-Type' => 'text/plain', 'Content-Length' => body.length.to_s }
    [status, headers, [body]]
@@ -90,6 +90,6 @@ if $0 == __FILE__
  require 'thin'
  require 'ebb'
 #  Rack::Handler::Mongrel.run(SimpleApp.new, :Port => 8000)
-  Thin::Server.start("0.0.0.0", 8000, SimpleApp.new) 
+  Thin::Server.start("0.0.0.0", 8000, SimpleApp.new)
 #  Ebb::start_server(SimpleApp.new, :port => 8000)
 end
--- a/benchmark/http_simple_bench.sh
+++ b/benchmark/http_simple_bench.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+SERVER=127.0.0.1
+PORT=8000
+
+# You may want to configure your TCP settings to make many ports available
+# to node and ab. On macintosh use: 
+#   sudo sysctl -w net.inet.ip.portrange.first=32768
+#   sudo sysctl -w net.inet.tcp.msl=1000
+
+if [ ! -d benchmark/ ]; then
+  echo "Run this script from the node root directory"
+  exit 1
+fi
+
+if [ $SERVER == "127.0.0.1" ]; then
+  ./node benchmark/http_simple.js &
+  node_pid=$!
+  sleep 1
+fi
+
+info=`curl -s http://$SERVER:$PORT/info`
+eval $info
+
+date=`date "+%Y%m%d%H%M%S"`
+
+ab_hello_world() {
+  local type="$1"
+  local ressize="$2"
+  if [ $type == "string" ]; then 
+    local uri="bytes/$ressize"
+  else
+    local uri="buffer/$ressize"
+  fi
+
+
+  name="ab-hello-world-$type-$ressize"
+
+  dir=".benchmark_reports/$name/$rev/"
+  if [ ! -d $dir ]; then
+    mkdir -p $dir
+  fi
+
+  summary_fn="$dir/$date.summary"
+  data_fn="$dir/$date.data"
+
+  echo "Bench $name starts in 3 seconds..."
+  # let shit calm down
+  sleep 3
+
+  # hammer that as hard as it can for 10 seconds.
+  ab -g $data_fn -c 100 -t 10 http://$SERVER:$PORT/$uri > $summary_fn
+
+  # add our data about the server
+  echo >> $summary_fn
+  echo >> $summary_fn
+  echo "webserver-rev: $rev" >> $summary_fn
+  echo "webserver-uname: $uname" >> $summary_fn
+
+  grep Req $summary_fn 
+
+  echo "Summary: $summary_fn"
+  echo
+}
+
+# 1k
+ab_hello_world 'string' '1024'
+ab_hello_world 'buffer' '1024'
+
+# 100k 
+ab_hello_world 'string' '102400'
+ab_hello_world 'buffer' '102400'
+
+
+if [ ! -z $node_pid ]; then
+  kill -9 $node_pid
+fi
--- a/benchmark/idle_clients.js
+++ b/benchmark/idle_clients.js
@@ -0,0 +1,49 @@
+net = require('net');
+
+var errors = 0, connections = 0;
+
+var lastClose = 0;
+
+function connect () {
+  process.nextTick(function () {
+    var s = net.Stream();
+    var gotConnected = false;
+    s.connect(9000);
+
+    s.on('connect', function () {
+      gotConnected = true;
+      connections++;
+      connect();
+    });
+
+    s.on('close', function () {
+      if (gotConnected) connections--;
+      lastClose = new Date();
+    });
+
+    s.on('error', function () {
+      errors++;
+    });
+  });
+}
+
+connect();
+
+
+var oldConnections, oldErrors;
+
+// Try to start new connections every so often
+setInterval(connect, 5000);
+
+setInterval(function () {
+  if (oldConnections != connections) {
+    oldConnections = connections;
+    console.log("CLIENT %d connections: %d", process.pid, connections);
+  }
+
+  if (oldErrors != errors) {
+    oldErrors = errors;
+    console.log("CLIENT %d errors: %d", process.pid, errors);
+  }
+}, 1000);
+
--- a/benchmark/idle_server.js
+++ b/benchmark/idle_server.js
@@ -0,0 +1,31 @@
+net = require('net');
+connections = 0;
+
+var errors = 0;
+
+server = net.Server(function (socket) {
+
+  socket.on('error', function () {
+    errors++; 
+  });
+
+});
+
+//server.maxConnections = 128;
+
+server.listen(9000);
+
+var oldConnections, oldErrors;
+
+setInterval(function () {
+  if (oldConnections != server.connections) {
+    oldConnections = server.connections;
+    console.log("SERVER %d connections: %d", process.pid, server.connections);
+  }
+
+  if (oldErrors != errors) {
+    oldErrors = errors;
+    console.log("SERVER %d errors: %d", process.pid, errors);
+  }
+}, 1000);
+
--- a/benchmark/io.c
+++ b/benchmark/io.c
@@ -0,0 +1,110 @@
+/**
+ * gcc -o iotest io.c
+ */
+
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+ 
+int tsize = 1000 * 1048576;
+const char *path = "/tmp/wt.dat";
+
+int c = 0;
+
+char* bufit(size_t l)
+{
+  char *p = malloc(l);
+  memset(p, '!', l);
+  return p;
+}
+
+void writetest(int size, size_t bsize)
+{
+  int i;
+  char *buf = bufit(bsize);
+  struct timeval start, end;
+  double elapsed;
+  double mbps;
+
+  int fd = open(path, O_CREAT|O_WRONLY, 0644);
+  if (fd < 0) {
+    perror("open failed");
+    exit(254);
+  }
+
+  assert(0 ==  gettimeofday(&start, NULL));
+  for (i = 0; i < size; i += bsize) {
+    int rv = write(fd, buf, bsize);
+    if (c++ % 2000 == 0) fprintf(stderr, ".");
+    if (rv < 0) {
+      perror("write failed");
+      exit(254);
+    }
+  }
+#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);
+}
+
+void readtest(int size, size_t bsize)
+{
+  int i;
+  char *buf = bufit(bsize);
+  struct timeval start, end;
+  double elapsed;
+  double mbps;
+
+  int fd = open(path, O_RDONLY, 0644);
+  if (fd < 0) {
+    perror("open failed");
+    exit(254);
+  }
+
+  assert(0 == gettimeofday(&start, NULL));
+  for (i = 0; i < size; i += bsize) {
+    int rv = read(fd, buf, bsize);
+    if (rv < 0) {
+      perror("write failed");
+      exit(254);
+    }
+  }
+  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);
+}
+
+void cleanup() {
+  unlink(path);
+}
+
+int main()
+{
+  int i;
+  int bsizes[] = {1024, 4096, 8192, 16384, 32768, 65536, 0};
+
+  for (i = 0; bsizes[i] != 0; i++) {
+    writetest(tsize, bsizes[i]);
+  }
+  for (i = 0; bsizes[i] != 0; i++) {
+    readtest(tsize, bsizes[i]);
+  }
+  atexit(cleanup);
+  return 0;
+}
--- a/benchmark/io.js
+++ b/benchmark/io.js
@@ -0,0 +1,109 @@
+var fs = require('fs');
+var util = require('util');
+var Buffer = require('buffer').Buffer;
+
+var path = "/tmp/wt.dat";
+var tsize = 1000 * 1048576;
+var bsizes = [1024, 4096, 8192, 16384, 32768, 65536];
+
+function bufit(size) {
+  var buf = new Buffer(size);
+  for (var i = 0; i <buf.length ; i += 1) {
+    buf[i] = 33;
+  }
+  return buf;
+}
+
+function once(emitter, name, cb) {
+  function incb() {
+    cb.apply(undefined, arguments);
+    emitter.removeListener(name, incb);
+  }
+  emitter.addListener(name, incb);
+}
+
+c = 0
+
+function writetest(size, bsize) {
+  var s = fs.createWriteStream(path, {'flags': 'w', 'mode': 0644});
+  var remaining = size;
+  var buf = bufit(bsize);
+
+  function dowrite() {
+    var rv = s.write(buf);
+    remaining -= buf.length;
+    if (remaining > 0) {
+      //if (remaining % 90000 == 0) console.error("remaining: %d", remaining);
+      //process.nextTick(dowrite);
+    } else {
+      s.emit('done')
+      s.end();
+    }
+  }
+
+  s.on('drain', function () {
+    dowrite();
+    if (c++ % 2000 == 0) util.print(".");
+  });
+
+  dowrite();
+
+  return s;
+}
+
+function readtest(size, bsize) {
+  var s = fs.createReadStream(path, {'flags': 'r', 'encoding': 'binary', 'mode': 0644, 'bufferSize': bsize});
+  s.addListener("data", function (chunk) {
+    // got a chunk...
+    
+  });
+  return s;
+}
+
+function wt(tsize, bsize, done) {
+  var start = Date.now();
+  s = writetest(tsize, bsizes[0]);
+  s.addListener('close', function() {
+    var end = Date.now();
+    var diff = end - start;
+    console.log('Wrote '+ tsize +' bytes in '+  diff/1000 +'s using '+ bsize +' byte buffers: '+  ((tsize/(diff/1000)) / 1048576) +' mB/s');
+    done();
+  });
+}
+
+function rt(tsize, bsize, done) {
+  var start = Date.now();
+  s = readtest(tsize, bsizes[0]);
+  s.addListener('close', function() {
+    var end = Date.now();
+    var diff = end - start;
+    console.log('Read '+ tsize +' bytes in '+  diff/1000 +'s using '+ bsize +' byte buffers: '+  ((tsize/(diff/1000)) / 1048576) +' mB/s');
+    done();
+  });
+}
+
+var bs= 0;
+
+function nextwt() {
+  if (bsizes.length <= bs) {
+    bs = 0;
+    nextrt();
+    return;
+  }
+  wt(tsize, bsizes[bs], nextwt);
+  bs += 1;
+}
+
+function nextrt() {
+  if (bsizes.length <= bs) {
+    fs.unlink(path, function (err) {
+      if (err) throw err;
+      console.log('All done!');
+    });
+    return;
+  }
+  rt(tsize, bsizes[bs], nextrt);
+  bs += 1;
+}
+
+nextwt();
--- a/benchmark/plot.R
+++ b/benchmark/plot.R
@@ -0,0 +1,86 @@
+#!/usr/bin/env Rscript
+
+# To use this script you'll need to install R: http://www.r-project.org/
+# and a library for R called ggplot2 
+# Which can be done by starting R and typing install.packages("ggplot2")
+# like this:
+#
+#     shell% R
+#     R version 2.11.0 beta (2010-04-12 r51689)
+#     >  install.packages("ggplot2")
+#     (follow prompt) 
+#
+# Then you can try this script by providing a full path to .data file
+# outputed from 'make bench'
+#
+#     > cd ~/src/node
+#     > make bench
+#     ...
+#     > ./benchmark/plot.R .benchmark_reports/ab-hello-world-buffer-1024/ff456b38862de3fd0118c6ac6b3f46edb1fbb87f/20101013162056.data
+#     
+# This will generate a PNG file which you can view
+#
+#
+# Hopefully these steps will be automated in the future.
+
+
+
+library(ggplot2)
+
+args <- commandArgs(TRUE)
+
+ab.load <- function (filename, name) {
+  raw <- data.frame(read.csv(filename, sep="\t", header=T), server=name)
+  raw <- data.frame(raw, time=raw$seconds-min(raw$seconds))
+  raw <- data.frame(raw, time_s=raw$time/1000000)
+  raw
+}
+
+#ab.tsPoint <- function (d) {
+#  qplot(time_s, ttime, data=d, facets=server~.,
+#        geom="point", alpha=I(1/15), ylab="response time (ms)",
+#        xlab="time (s)", main="c=30, res=26kb", 
+#        ylim=c(0,100))
+#}
+#
+#ab.tsLine <- function (d) {
+#  qplot(time_s, ttime, data=d, facets=server~.,
+#        geom="line", ylab="response time (ms)",
+#        xlab="time (s)", main="c=30, res=26kb", 
+#        ylim=c(0,100))
+#}
+
+
+filename <- args[0:1]
+data <- ab.load(filename, "node")
+
+
+# histogram
+
+#hist_png_filename <- gsub(".data", "_hist.png", filename)
+hist_png_filename <- "hist.png"
+
+png(filename = hist_png_filename, width = 480, height = 380, units = "px")
+
+qplot(ttime, data=data, geom="histogram",
+      main="xxx",
+      binwidth=1, xlab="response time (ms)",
+      xlim=c(0,50))
+
+print(hist_png_filename)
+
+
+
+# time series
+
+#ts_png_filename <- gsub(".data", "_ts.png", filename)
+ts_png_filename = "ts.png"
+
+png(filename = ts_png_filename, width = 480, height = 380, units = "px")
+
+qplot(time, ttime, data=data, facets=server~.,
+      geom="point", alpha=I(1/15), ylab="response time (ms)",
+      xlab="time (s)", main="xxx",
+      ylim=c(0,100))
+
+print(ts_png_filename)
--- a/benchmark/process_loop.js
+++ b/benchmark/process_loop.js
@@ -1,4 +1,4 @@
-var sys = require("sys"),
+var util = require("util"),
    childProcess = require("child_process");

 function next (i) {
@@ -7,7 +7,7 @@ function next (i) {
  var child = childProcess.spawn("echo", ["hello"]);

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

  child.addListener("exit", function (code) {
--- a/benchmark/run.js
+++ b/benchmark/run.js
@@ -1,5 +1,5 @@
 var path = require("path");
-var sys = require("sys");
+var util = require("util");
 var childProcess = require("child_process");
 var benchmarks = [ "timers.js"
                 , "process_loop.js"
@@ -19,12 +19,12 @@ function exec (script, callback) {

 function runNext (i) {
  if (i >= benchmarks.length) return;
-  sys.print(benchmarks[i] + ": ");
+  util.print(benchmarks[i] + ": ");
  exec(benchmarks[i], function (elapsed, code) {
    if (code != 0) {
-      sys.puts("ERROR  ");
+      console.log("ERROR  ");
    }
-    sys.puts(elapsed);
+    console.log(elapsed);
    runNext(i+1);
  });
 };
--- a/benchmark/settimeout.js
+++ b/benchmark/settimeout.js
@@ -0,0 +1,15 @@
+console.log("wait...");
+var done = 0;
+var N = 5000000;
+var begin = new Date();
+for (var i = 0; i < N; i++) {
+  setTimeout(function () {
+    if (++done == N) {
+      var end = new Date();
+      console.log("smaller is better");
+      console.log("startup: %d", start - begin);
+      console.log("done: %d", end - start);
+    }
+  }, 1000);
+}
+var start = new Date();
--- a/benchmark/startup.js
+++ b/benchmark/startup.js
@@ -0,0 +1,26 @@
+var spawn = require('child_process').spawn,
+    path = require('path'),
+    emptyJsFile = path.join(__dirname, '../test/fixtures/semicolon.js'),
+    starts = 100,
+    i = 0,
+    start;
+
+function startNode() {
+  var node = spawn(process.execPath || process.argv[0], [emptyJsFile]);
+  node.on('exit', function(exitCode) {
+    if (exitCode !== 0) {
+      throw new Error('Error during node startup');
+    }
+
+    i++;
+    if (i < starts) {
+      startNode();
+    } else{
+      var duration = +new Date - start;
+      console.log('Started node %d times in %s ms. %d ms / start.', starts, duration, duration / starts);
+    }
+  });
+}
+
+start = +new Date;
+startNode();
--- a/benchmark/string_creation.js
+++ b/benchmark/string_creation.js
@@ -0,0 +1,6 @@
+
+
+for (var i = 0; i < 9e7; i++) {
+  s = '01234567890';
+  s[1] = "a";
+}
--- a/bin/node-repl
+++ b/bin/node-repl
@@ -1,13 +0,0 @@
-#!/usr/bin/env node
-
-puts = require("sys").puts;
-
-puts("Welcome to the Node.js REPL.");
-puts("Enter ECMAScript at the prompt.");
-puts("Tip 1: Use 'rlwrap node-repl' for a better interface");
-puts("Tip 2: Type Control-D to exit.");
-puts("Type '.help' for options.");
-
-require('repl').start();
-
-// vim:ft=javascript
--- a/cmake/CTestCustom.cmake
+++ b/cmake/CTestCustom.cmake
@@ -0,0 +1,2 @@
+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/configure.cmake
+++ b/cmake/configure.cmake
@@ -0,0 +1,92 @@
+#
+# 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)
+
+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()
--- a/cmake/docs.cmake
+++ b/cmake/docs.cmake
@@ -0,0 +1,80 @@
+#
+# 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
@@ -0,0 +1,18 @@
+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
@@ -0,0 +1,10 @@
+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
@@ -0,0 +1,50 @@
+#
+# 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)
+
+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(${OPENSSL_FOUND} MATCHES True)
+  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
@@ -0,0 +1,25 @@
+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
@@ -0,0 +1,77 @@
+#
+# 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_extra_src "src/platform_${node_platform}.cc")
+
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/${node_extra_src})
+  set(node_extra_src "src/platform_none.cc")
+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})
+
+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
@@ -0,0 +1,35 @@
+#
+# 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
@@ -0,0 +1,91 @@
+#
+# 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})
+
+
+  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 ${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 ${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/config.h.cmake
+++ b/config.h.cmake
@@ -0,0 +1,2 @@
+#cmakedefine HAVE_OPENSSL 1
+#cmakedefine HAVE_CONFIG_H 1
--- a/4
+++ b/4
@@ -11,10 +11,10 @@ CUR_DIR=$PWD

 #possible relative path
 WORKINGDIR=`dirname $0`
-cd $WORKINGDIR
+cd "$WORKINGDIR"
 #abs path
 WORKINGDIR=`pwd`
-cd $CUR_DIR
+cd "$CUR_DIR"

 "${WORKINGDIR}/tools/waf-light" --jobs=1 configure $*

--- a/deps/c-ares/CHANGES
+++ b/deps/c-ares/CHANGES
@@ -1,7 +1,30 @@
  Changelog for the c-ares project

+Version 1.7.3 (June 11, 2010)
+
+Fixed:
+
+ o builds on Android
+ o now includes all files necessary to build it (1.7.2 lacked a file)
+
+Version 1.7.2 (June 10, 2010)
+
+Changed:
+
+ o Added ares_parse_mx_reply()
+
+Fixed:
+
+ o ares_init: Last, not first instance of domain or search should win
+ o improve alternative definition of bool
+ o fix VS2010 compiler warnings
+
+
 Version 1.7.1 (Mar 23, 2010)

+* May 31, 2010 (Jakub Hrozek)
+- Use the last instance of domain/search, not the first one
+
 * March 23, 2010 (Daniel Stenberg)
 - We switched from CVS to git. See http://github.com/bagder/c-ares

@@ -27,7 +50,7 @@ Version 1.7.1 (Mar 23, 2010)
  functions do not support IPv6 name servers. This implies that if the user
  is capable of defining or providing an IPv6 name server, and the app is
  using ares_init_options() or ares_save_options() at some point to handle
-  the name servers, the app will likely loose IPv6 name servers.
+  the name servers, the app will likely lose IPv6 name servers.

 * January 28, 2010 (Daniel Stenberg)
 - Tommie Gannert pointed out a silly bug in ares_process_fd() since it didn't
--- a/deps/c-ares/CMakeLists.txt
+++ b/deps/c-ares/CMakeLists.txt
@@ -0,0 +1,22 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${node_platform}-${cares_arch})
+add_definitions(-DHAVE_CONFIG_H=1)
+
+include(CheckLibraryExists)
+check_library_exists(socket socket "" HAVE_SOCKET_LIB)
+check_library_exists(nsl gethostbyname "" HAVE_NSL_LIB)
+
+file(GLOB lib_sources *.c)
+add_library(cares ${lib_sources})
+
+if(${HAVE_SOCKET_LIB})
+  set(cares_libs ${cares_libs} socket)
+endif()
+
+if(${HAVE_NSL_LIB})
+  set(cares_libs ${cares_libs} nsl)
+endif()
+
+if(cares_libs)
+  target_link_libraries(cares ${cares_libs})
+endif()
--- a/deps/c-ares/README
+++ b/deps/c-ares/README
@@ -44,7 +44,7 @@ The following notes apply to c-ares version 1.7.0 and later.
 * If you intend to distribute an already compiled c-ares library you _MUST_
  also distribute along with it the generated ares_build.h which has been
  used to compile it. Otherwise the library will be of no use for the users of
-  the library that you have built. It is _your_ responsability to provide this
+  the library that you have built. It is _your_ responsibility to provide this
  file. No one at the c-ares project can know how you have built the library.

 * File ares_build.h includes platform and configuration dependent info,
--- a/deps/c-ares/README.msvc
+++ b/deps/c-ares/README.msvc
@@ -1,4 +1,3 @@
- $Id$


                          ___       __ _ _ __ ___  ___ 
--- a/deps/c-ares/README.node
+++ b/deps/c-ares/README.node
@@ -1,6 +1,6 @@
 Library: c-ares, DNS resolver

-Version: 1.7.1 (23 march, 2010)
+Version: 1.7.3 (11 June, 2010)

 Authors: Greg Hudson, Daniel Stenberg

--- a/deps/c-ares/RELEASE-NOTES
+++ b/deps/c-ares/RELEASE-NOTES
@@ -1,18 +1,12 @@
-This is what's new and changed in the c-ares 1.7.1 release:
-
-Changed:
-
- o added IPv6 name servers support
+c-ares version 1.7.3

 Fixed:

- o closing of sockets on Windows systems
- o MSVC deprecated compiler options warnings
- o ares_process_fd() didn't check broken connections
+ o builds on Android
+ o now includes all files necessary to build it (1.7.2 lacked a file)

 Thanks go to these friendly people for their efforts and contributions:

- Ingmar Runge, Laszlo Tamas Szabo, Yang Tse, Tommie Gannert, Gregor Jasny,
- Phil Blundell, Cedric Bail, Jakub Hrozek
+ Yang Tse, Bogdan Vatra

 Have fun!
--- a/deps/c-ares/ares.h
+++ b/deps/c-ares/ares.h
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998, 2009 by the Massachusetts Institute of Technology.
 * Copyright (C) 2007-2010 by Daniel Stenberg
@@ -434,6 +433,12 @@ struct ares_srv_reply {
  unsigned short          port;
 };

+struct ares_mx_reply {
+  struct ares_mx_reply   *next;
+  char                   *host;
+  unsigned short          priority;
+};
+
 struct ares_txt_reply {
  struct ares_txt_reply  *next;
  unsigned char          *txt;
@@ -475,6 +480,10 @@ CARES_EXTERN int ares_parse_srv_reply(const unsigned char* abuf,
                                      int alen,
                                      struct ares_srv_reply** srv_out);

+CARES_EXTERN int ares_parse_mx_reply(const unsigned char* abuf,
+                                      int alen,
+                                      struct ares_mx_reply** mx_out);
+
 CARES_EXTERN int ares_parse_txt_reply(const unsigned char* abuf,
                                      int alen,
                                      struct ares_txt_reply** txt_out);
--- a/deps/c-ares/ares__close_sockets.c
+++ b/deps/c-ares/ares__close_sockets.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares__get_hostent.c
+++ b/deps/c-ares/ares__get_hostent.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998, 2010 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares__read_line.c
+++ b/deps/c-ares/ares__read_line.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares__timeval.c
+++ b/deps/c-ares/ares__timeval.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2008 by Daniel Stenberg et al
 *
--- a/deps/c-ares/ares_cancel.c
+++ b/deps/c-ares/ares_cancel.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2004 by Daniel Stenberg et al
 *
--- a/deps/c-ares/ares_data.c
+++ b/deps/c-ares/ares_data.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2009-2010 by Daniel Stenberg
 *
@@ -63,6 +62,14 @@ void ares_free_data(void *dataptr)

  switch (ptr->type)
    {
+      case ARES_DATATYPE_MX_REPLY:
+
+        if (ptr->data.mx_reply.next)
+          ares_free_data(ptr->data.mx_reply.next);
+        if (ptr->data.mx_reply.host)
+          free(ptr->data.mx_reply.host);
+        break;
+
      case ARES_DATATYPE_SRV_REPLY:

        if (ptr->data.srv_reply.next)
@@ -114,6 +121,12 @@ void *ares_malloc_data(ares_datatype type)

  switch (type)
    {
+      case ARES_DATATYPE_MX_REPLY:
+        ptr->data.mx_reply.next = NULL;
+        ptr->data.mx_reply.host = NULL;
+        ptr->data.mx_reply.priority = 0;
+        break;
+
      case ARES_DATATYPE_SRV_REPLY:
        ptr->data.srv_reply.next = NULL;
        ptr->data.srv_reply.host = NULL;
--- a/deps/c-ares/ares_data.h
+++ b/deps/c-ares/ares_data.h
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2009-2010 by Daniel Stenberg
 *
@@ -20,6 +19,7 @@ typedef enum {
  ARES_DATATYPE_SRV_REPLY,    /* struct ares_srv_reply - introduced in 1.7.0 */
  ARES_DATATYPE_TXT_REPLY,    /* struct ares_txt_reply - introduced in 1.7.0 */
  ARES_DATATYPE_ADDR_NODE,    /* struct ares_addr_node - introduced in 1.7.1 */
+  ARES_DATATYPE_MX_REPLY,    /* struct ares_mx_reply   - introduced in 1.7.2 */
 #if 0
  ARES_DATATYPE_ADDR6TTL,     /* struct ares_addrttl   */
  ARES_DATATYPE_ADDRTTL,      /* struct ares_addr6ttl  */
@@ -56,6 +56,7 @@ struct ares_data {
    struct ares_txt_reply txt_reply;
    struct ares_srv_reply srv_reply;
    struct ares_addr_node addr_node;
+    struct ares_mx_reply mx_reply;
  } data;
 };

--- a/deps/c-ares/ares_destroy.c
+++ b/deps/c-ares/ares_destroy.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2004-2010 by Daniel Stenberg
--- a/deps/c-ares/ares_dns.h
+++ b/deps/c-ares/ares_dns.h
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_expand_name.c
+++ b/deps/c-ares/ares_expand_name.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_expand_string.c
+++ b/deps/c-ares/ares_expand_string.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_fds.c
+++ b/deps/c-ares/ares_fds.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_free_hostent.c
+++ b/deps/c-ares/ares_free_hostent.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_free_string.c
+++ b/deps/c-ares/ares_free_string.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 2000 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_gethostbyaddr.c
+++ b/deps/c-ares/ares_gethostbyaddr.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
@@ -191,8 +190,8 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
    char tmp[MAX_PATH];
    HKEY hkeyHosts;

-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
-        == ERROR_SUCCESS)
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
+                     &hkeyHosts) == ERROR_SUCCESS)
    {
      DWORD dwLength = MAX_PATH;
      RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
@@ -241,12 +240,14 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
        }
      if (addr->family == AF_INET)
        {
-          if (memcmp((*host)->h_addr, &addr->addrV4, sizeof(addr->addrV4)) == 0)
+          if (memcmp((*host)->h_addr, &addr->addrV4,
+                     sizeof(addr->addrV4)) == 0)
            break;
        }
      else if (addr->family == AF_INET6)
        {
-          if (memcmp((*host)->h_addr, &addr->addrV6, sizeof(addr->addrV6)) == 0)
+          if (memcmp((*host)->h_addr, &addr->addrV6,
+                     sizeof(addr->addrV6)) == 0)
            break;
        }
      ares_free_hostent(*host);
--- a/deps/c-ares/ares_gethostbyname.c
+++ b/deps/c-ares/ares_gethostbyname.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
@@ -151,8 +150,8 @@ static void next_lookup(struct host_query *hquery, int status_code)
          }
          else {
            hquery->sent_family = AF_INET;
-            ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
-                        hquery);
+            ares_search(hquery->channel, hquery->name, C_IN, T_A,
+                        host_callback, hquery);
          }
          return;

@@ -195,9 +194,10 @@ static void host_callback(void *arg, int status, int timeouts,
        {
          status = ares_parse_aaaa_reply(abuf, alen, &host, NULL, NULL);
          if (status == ARES_ENODATA || status == ARES_EBADRESP) {
-            /* The query returned something but either there were no AAAA records (e.g. just CNAME) 
-               or the response was malformed.  Try looking up A instead.  
-               We should possibly limit this attempt-next logic to AF_UNSPEC lookups only. */
+            /* The query returned something but either there were no AAAA
+               records (e.g. just CNAME) or the response was malformed.  Try
+               looking up A instead.  We should possibly limit this
+               attempt-next logic to AF_UNSPEC lookups only. */
            hquery->sent_family = AF_INET;
            ares_search(hquery->channel, hquery->name, C_IN, T_A,
                        host_callback, hquery);
@@ -208,10 +208,12 @@ static void host_callback(void *arg, int status, int timeouts,
        }
      end_hquery(hquery, status, host);
    }
-  else if ((status == ARES_ENODATA || status == ARES_EBADRESP || status == ARES_ETIMEOUT) && hquery->sent_family == AF_INET6)
+  else if ((status == ARES_ENODATA || status == ARES_EBADRESP ||
+            status == ARES_ETIMEOUT) && hquery->sent_family == AF_INET6)
    {
-      /* The AAAA query yielded no useful result.  Now look up an A instead.  
-         We should possibly limit this attempt-next logic to AF_UNSPEC lookups only. */
+      /* The AAAA query yielded no useful result.  Now look up an A instead.
+         We should possibly limit this attempt-next logic to AF_UNSPEC lookups
+         only. */
      hquery->sent_family = AF_INET;
      ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
                  hquery);
@@ -235,8 +237,8 @@ static void end_hquery(struct host_query *hquery, int status,
 /* If the name looks like an IP address, fake up a host entry, end the
 * query immediately, and return true.  Otherwise return false.
 */
-static int fake_hostent(const char *name, int family, ares_host_callback callback,
-                        void *arg)
+static int fake_hostent(const char *name, int family,
+                        ares_host_callback callback, void *arg)
 {
  struct hostent hostent;
  char *aliases[1] = { NULL };
@@ -346,8 +348,8 @@ static int file_lookup(const char *name, int family, struct hostent **host)
    char tmp[MAX_PATH];
    HKEY hkeyHosts;

-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
-        == ERROR_SUCCESS)
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
+                     &hkeyHosts) == ERROR_SUCCESS)
    {
      DWORD dwLength = MAX_PATH;
      RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
@@ -408,8 +410,8 @@ static int file_lookup(const char *name, int family, struct hostent **host)
  return status;
 }

-static void sort_addresses(struct hostent *host, const struct apattern *sortlist,
-                           int nsort)
+static void sort_addresses(struct hostent *host,
+                           const struct apattern *sortlist, int nsort)
 {
  struct in_addr a1, a2;
  int i1, i2, ind1, ind2;
@@ -464,8 +466,8 @@ static int get_address_index(const struct in_addr *addr,
  return i;
 }

-static void sort6_addresses(struct hostent *host, const struct apattern *sortlist,
-                           int nsort)
+static void sort6_addresses(struct hostent *host,
+                            const struct apattern *sortlist, int nsort)
 {
  struct ares_in6_addr a1, a2;
  int i1, i2, ind1, ind2;
--- a/deps/c-ares/ares_getnameinfo.c
+++ b/deps/c-ares/ares_getnameinfo.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 2005 by Dominick Meglio
 *
@@ -81,7 +80,8 @@ struct nameinfo_query {
        (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"))
 #endif

-static void nameinfo_callback(void *arg, int status, int timeouts, struct hostent *host);
+static void nameinfo_callback(void *arg, int status, int timeouts,
+                              struct hostent *host);
 static char *lookup_service(unsigned short port, int flags,
                            char *buf, size_t buflen);
 #ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
@@ -202,7 +202,8 @@ void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa,
    }
 }

-static void nameinfo_callback(void *arg, int status, int timeouts, struct hostent *host)
+static void nameinfo_callback(void *arg, int status, int timeouts,
+                              struct hostent *host)
 {
  struct nameinfo_query *niquery = (struct nameinfo_query *) arg;
  char srvbuf[33];
@@ -221,8 +222,8 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
            service = lookup_service(niquery->addr.addr6.sin6_port,
                                     niquery->flags, srvbuf, sizeof(srvbuf));
        }
-      /* NOFQDN means we have to strip off the domain name portion.
-         We do this by determining our own domain name, then searching the string
+      /* NOFQDN means we have to strip off the domain name portion.  We do
+         this by determining our own domain name, then searching the string
         for this domain name and removing it.
       */
 #ifdef HAVE_GETHOSTNAME
@@ -239,7 +240,8 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
             }
        }
 #endif
-      niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, (char *)(host->h_name),
+      niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts,
+                        (char *)(host->h_name),
                        service);
      return;
    }
@@ -248,12 +250,15 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
    {
      char ipbuf[IPBUFSIZ];
      if (niquery->family == AF_INET)
-        ares_inet_ntop(AF_INET, &niquery->addr.addr4.sin_addr, ipbuf, IPBUFSIZ);
+        ares_inet_ntop(AF_INET, &niquery->addr.addr4.sin_addr, ipbuf,
+                       IPBUFSIZ);
      else
        {
-          ares_inet_ntop(AF_INET6, &niquery->addr.addr6.sin6_addr, ipbuf, IPBUFSIZ);
+          ares_inet_ntop(AF_INET6, &niquery->addr.addr6.sin6_addr, ipbuf,
+                         IPBUFSIZ);
 #ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
-          append_scopeid(&niquery->addr.addr6, niquery->flags, ipbuf, sizeof(ipbuf));
+          append_scopeid(&niquery->addr.addr6, niquery->flags, ipbuf,
+                         sizeof(ipbuf));
 #endif
        }
      /* They want a service too */
@@ -266,7 +271,8 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
            service = lookup_service(niquery->addr.addr6.sin6_port,
                                     niquery->flags, srvbuf, sizeof(srvbuf));
        }
-      niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, ipbuf, service);
+      niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, ipbuf,
+                        service);
      return;
    }
  niquery->callback(niquery->arg, status, niquery->timeouts, NULL, NULL);
@@ -301,10 +307,12 @@ static char *lookup_service(unsigned short port, int flags,
          sep = &se;
          memset(tmpbuf, 0, sizeof(tmpbuf));
 #if GETSERVBYPORT_R_ARGS == 6
-          if (getservbyport_r(port, proto, &se, (void *)tmpbuf, sizeof(tmpbuf), &sep) != 0)
+          if (getservbyport_r(port, proto, &se, (void *)tmpbuf,
+                              sizeof(tmpbuf), &sep) != 0)
            sep = NULL;
 #elif GETSERVBYPORT_R_ARGS == 5
-          sep = getservbyport_r(port, proto, &se, (void *)tmpbuf, sizeof(tmpbuf));
+          sep = getservbyport_r(port, proto, &se, (void *)tmpbuf,
+                                sizeof(tmpbuf));
 #elif GETSERVBYPORT_R_ARGS == 4
          if (getservbyport_r(port, proto, &se, (void *)tmpbuf) != 0)
            sep = NULL;
@@ -350,7 +358,8 @@ static void append_scopeid(struct sockaddr_in6 *addr6, unsigned int flags,
  char fmt_lu[] = "%lu";
  char tmpbuf[IF_NAMESIZE + 2];
  size_t bufl;
-  char *fmt = (sizeof(addr6->sin6_scope_id) > sizeof(unsigned int))?fmt_lu:fmt_u;
+  char *fmt = (sizeof(addr6->sin6_scope_id) > sizeof(unsigned int))?
+    fmt_lu:fmt_u;

  tmpbuf[0] = '%';

--- a/deps/c-ares/ares_getopt.c
+++ b/deps/c-ares/ares_getopt.c
@@ -3,7 +3,6 @@
 * on 2007-04-11.  Lifted from version 5.2 of the 'Open Mash' project with
 * the modified BSD license, BSD license without the advertising clause.
 *
- * $Id$
 */

 /*
--- a/deps/c-ares/ares_getsock.c
+++ b/deps/c-ares/ares_getsock.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2005 - 2010, Daniel Stenberg
 *
--- a/deps/c-ares/ares_init.c
+++ b/deps/c-ares/ares_init.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2007-2010 by Daniel Stenberg
@@ -70,6 +69,10 @@
 #include "ares_library_init.h"
 #include "ares_private.h"

+#ifdef ANDROID
+#include <sys/system_properties.h>
+#endif
+
 #ifdef WATT32
 #undef WIN32  /* Redefined in MingW/MSVC headers */
 #endif
@@ -825,6 +828,12 @@ DhcpNameServer
      servers[i].addr.addrV4.s_addr = htonl(def_nameservers[i]);
  status = ARES_EOF;

+#elif defined(ANDROID)
+  char value[PROP_VALUE_MAX]="";
+  __system_property_get("net.dns1", value);
+  status = config_nameserver(&servers, &nservers, value);
+  if (status == ARES_SUCCESS)
+    status = ARES_EOF;
 #else
  {
    char *p;
@@ -840,11 +849,11 @@ DhcpNameServer
    if (fp) {
      while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
      {
-        if ((p = try_config(line, "domain")) && channel->ndomains == -1)
+        if ((p = try_config(line, "domain")))
          status = config_domain(channel, p);
        else if ((p = try_config(line, "lookup")) && !channel->lookups)
          status = config_lookup(channel, p, "bind", "file");
-        else if ((p = try_config(line, "search")) && channel->ndomains == -1)
+        else if ((p = try_config(line, "search")))
          status = set_search(channel, p);
        else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
          status = config_nameserver(&servers, &nservers, p);
--- a/deps/c-ares/ares_ipv6.h
+++ b/deps/c-ares/ares_ipv6.h
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2005 by Dominick Meglio
 *
--- a/deps/c-ares/ares_library_init.c
+++ b/deps/c-ares/ares_library_init.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2004-2009 by Daniel Stenberg
--- a/deps/c-ares/ares_library_init.h
+++ b/deps/c-ares/ares_library_init.h
@@ -1,7 +1,6 @@
 #ifndef HEADER_CARES_LIBRARY_INIT_H
 #define HEADER_CARES_LIBRARY_INIT_H

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2004-2009 by Daniel Stenberg
--- a/deps/c-ares/ares_llist.c
+++ b/deps/c-ares/ares_llist.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_llist.h
+++ b/deps/c-ares/ares_llist.h
@@ -1,7 +1,6 @@
 #ifndef __ARES_LLIST_H
 #define __ARES_LLIST_H

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_mkquery.c
+++ b/deps/c-ares/ares_mkquery.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_nowarn.c
+++ b/deps/c-ares/ares_nowarn.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright (C) 2010 by Daniel Stenberg
 *
--- a/deps/c-ares/ares_nowarn.h
+++ b/deps/c-ares/ares_nowarn.h
@@ -1,7 +1,6 @@
 #ifndef HEADER_CARES_NOWARN_H
 #define HEADER_CARES_NOWARN_H

-/* $Id$ */

 /* Copyright (C) 2010 by Daniel Stenberg
 *
--- a/deps/c-ares/ares_options.c
+++ b/deps/c-ares/ares_options.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2008-2010 by Daniel Stenberg
--- a/deps/c-ares/ares_parse_a_reply.c
+++ b/deps/c-ares/ares_parse_a_reply.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
@@ -202,7 +201,7 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
        }
    }

-  if (status == ARES_SUCCESS && naddrs == 0)
+  if (status == ARES_SUCCESS && naddrs == 0 && naliases == 0)
    status = ARES_ENODATA;
  if (status == ARES_SUCCESS)
    {
--- a/deps/c-ares/ares_parse_aaaa_reply.c
+++ b/deps/c-ares/ares_parse_aaaa_reply.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright 2005 Dominick Meglio
--- a/deps/c-ares/ares_parse_mx_reply.c
+++ b/deps/c-ares/ares_parse_mx_reply.c
@@ -0,0 +1,170 @@
+
+/* Copyright 1998 by the Massachusetts Institute of Technology.
+ * Copyright (C) 2010 Jeremy Lal <kapouer@melix.org>
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in
+ * advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+#include "ares_setup.h"
+
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#  include <arpa/inet.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#  include <arpa/nameser.h>
+#else
+#  include "nameser.h"
+#endif
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#  include <arpa/nameser_compat.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "ares.h"
+#include "ares_dns.h"
+#include "ares_data.h"
+#include "ares_private.h"
+
+int
+ares_parse_mx_reply (const unsigned char *abuf, int alen,
+                      struct ares_mx_reply **mx_out)
+{
+  unsigned int qdcount, ancount, i;
+  const unsigned char *aptr, *vptr;
+  int status, rr_type, rr_class, rr_len;
+  long len;
+  char *hostname = NULL, *rr_name = NULL;
+  struct ares_mx_reply *mx_head = NULL;
+  struct ares_mx_reply *mx_last = NULL;
+  struct ares_mx_reply *mx_curr;
+
+  /* Set *mx_out to NULL for all failure cases. */
+  *mx_out = NULL;
+
+  /* Give up if abuf doesn't have room for a header. */
+  if (alen < HFIXEDSZ)
+    return ARES_EBADRESP;
+
+  /* Fetch the question and answer count from the header. */
+  qdcount = DNS_HEADER_QDCOUNT (abuf);
+  ancount = DNS_HEADER_ANCOUNT (abuf);
+  if (qdcount != 1)
+    return ARES_EBADRESP;
+  if (ancount == 0)
+    return ARES_ENODATA;
+
+  /* Expand the name from the question, and skip past the question. */
+  aptr = abuf + HFIXEDSZ;
+  status = ares_expand_name (aptr, abuf, alen, &hostname, &len);
+  if (status != ARES_SUCCESS)
+    return status;
+
+  if (aptr + len + QFIXEDSZ > abuf + alen)
+    {
+      free (hostname);
+      return ARES_EBADRESP;
+    }
+  aptr += len + QFIXEDSZ;
+
+  /* Examine each answer resource record (RR) in turn. */
+  for (i = 0; i < ancount; i++)
+    {
+      /* Decode the RR up to the data field. */
+      status = ares_expand_name (aptr, abuf, alen, &rr_name, &len);
+      if (status != ARES_SUCCESS)
+        {
+          break;
+        }
+      aptr += len;
+      if (aptr + RRFIXEDSZ > abuf + alen)
+        {
+          status = ARES_EBADRESP;
+          break;
+        }
+      rr_type = DNS_RR_TYPE (aptr);
+      rr_class = DNS_RR_CLASS (aptr);
+      rr_len = DNS_RR_LEN (aptr);
+      aptr += RRFIXEDSZ;
+
+      /* Check if we are really looking at a MX record */
+      if (rr_class == C_IN && rr_type == T_MX)
+        {
+          /* parse the MX record itself */
+          if (rr_len < 2)
+            {
+              status = ARES_EBADRESP;
+              break;
+            }
+
+          /* Allocate storage for this MX answer appending it to the list */
+          mx_curr = ares_malloc_data(ARES_DATATYPE_MX_REPLY);
+          if (!mx_curr)
+            {
+              status = ARES_ENOMEM;
+              break;
+            }
+          if (mx_last)
+            {
+              mx_last->next = mx_curr;
+            }
+          else
+            {
+              mx_head = mx_curr;
+            }
+          mx_last = mx_curr;
+
+          vptr = aptr;
+          mx_curr->priority = ntohs (*((unsigned short *)vptr));
+          vptr += sizeof(unsigned short);
+
+          status = ares_expand_name (vptr, abuf, alen, &mx_curr->host, &len);
+          if (status != ARES_SUCCESS)
+            break;
+        }
+
+      /* Don't lose memory in the next iteration */
+      free (rr_name);
+      rr_name = NULL;
+
+      /* Move on to the next record */
+      aptr += rr_len;
+    }
+
+  if (hostname)
+    free (hostname);
+  if (rr_name)
+    free (rr_name);
+
+  /* clean up on error */
+  if (status != ARES_SUCCESS)
+    {
+      if (mx_head)
+        ares_free_data (mx_head);
+      return status;
+    }
+
+  /* everything looks fine, return the data */
+  *mx_out = mx_head;
+
+  return ARES_SUCCESS;
+}
--- a/deps/c-ares/ares_parse_ptr_reply.c
+++ b/deps/c-ares/ares_parse_ptr_reply.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_parse_srv_reply.c
+++ b/deps/c-ares/ares_parse_srv_reply.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2009 by Jakub Hrozek <jhrozek@redhat.com>
--- a/deps/c-ares/ares_parse_txt_reply.c
+++ b/deps/c-ares/ares_parse_txt_reply.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2009 by Jakub Hrozek <jhrozek@redhat.com>
--- a/deps/c-ares/ares_private.h
+++ b/deps/c-ares/ares_private.h
@@ -1,7 +1,6 @@
 #ifndef __ARES_PRIVATE_H
 #define __ARES_PRIVATE_H

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2004-2010 by Daniel Stenberg
--- a/deps/c-ares/ares_process.c
+++ b/deps/c-ares/ares_process.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 * Copyright (C) 2004-2010 by Daniel Stenberg
@@ -948,7 +947,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
   * Disable the Nagle algorithm (only relevant for TCP sockets, and thus not
   * in configure_socket). In general, in DNS lookups we're pretty much
   * interested in firing off a single request and then waiting for a reply,
-   * so batching isn't very interesting in general.
+   * so batching isn't very interesting.
   */
  opt = 1;
  if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY,
--- a/deps/c-ares/ares_query.c
+++ b/deps/c-ares/ares_query.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_rules.h
+++ b/deps/c-ares/ares_rules.h
@@ -1,7 +1,6 @@
 #ifndef __CARES_RULES_H
 #define __CARES_RULES_H

-/* $Id$ */

 /* Copyright (C) 2009 by Daniel Stenberg et al
 *
--- a/deps/c-ares/ares_search.c
+++ b/deps/c-ares/ares_search.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_send.c
+++ b/deps/c-ares/ares_send.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_strcasecmp.c
+++ b/deps/c-ares/ares_strcasecmp.c
@@ -1,5 +1,4 @@

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_strcasecmp.h
+++ b/deps/c-ares/ares_strcasecmp.h
@@ -1,7 +1,6 @@
 #ifndef HEADER_CARES_STRCASECMP_H
 #define HEADER_CARES_STRCASECMP_H

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_strdup.c
+++ b/deps/c-ares/ares_strdup.c
@@ -1,5 +1,4 @@

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_strdup.h
+++ b/deps/c-ares/ares_strdup.h
@@ -1,7 +1,6 @@
 #ifndef HEADER_CARES_STRDUP_H
 #define HEADER_CARES_STRDUP_H

-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_strerror.c
+++ b/deps/c-ares/ares_strerror.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_timeout.c
+++ b/deps/c-ares/ares_timeout.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 /* Copyright 1998 by the Massachusetts Institute of Technology.
 *
--- a/deps/c-ares/ares_version.c
+++ b/deps/c-ares/ares_version.c
@@ -1,4 +1,3 @@
-/* $Id$ */

 #include "ares_setup.h"
 #include "ares.h"
--- a/deps/c-ares/ares_version.h
+++ b/deps/c-ares/ares_version.h
@@ -1,15 +1,14 @@
-/* $Id$ */

 #ifndef ARES__VERSION_H
 #define ARES__VERSION_H

 #define ARES_VERSION_MAJOR 1
 #define ARES_VERSION_MINOR 7
-#define ARES_VERSION_PATCH 1
+#define ARES_VERSION_PATCH 3
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
                       (ARES_VERSION_MINOR<<8)|\
                       (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.7.1"
+#define ARES_VERSION_STR "1.7.3"

 #if (ARES_VERSION >= 0x010700)
 #  define CARES_HAVE_ARES_LIBRARY_INIT 1
--- a/Show More
+++ b/Show More