Merge remote-tracking branch 'upstream/v0.12'

Conflicts:
	src/node_version.h

.gitignore

@@ -15,6 +15,7 @@ node_g
 .benchmark_reports
 /.project
 /.cproject
+icu_config.gypi
 
 /out
 
@@ -45,6 +46,10 @@ ipch/
 /test/addons/doc-*/
 email.md
 deps/v8-*
+deps/icu
+deps/icu*.zip
+deps/icu*.tgz
+deps/icu-tmp
 ./node_modules
 .svn/
 
@@ -67,3 +72,4 @@ deps/zlib/zlib.target.mk
 
 # test artifacts
 tools/faketime
+icu_config.gypi

AUTHORS

@@ -568,3 +568,15 @@ Kevin Simper <[email protected]>
 Jackson Tian <[email protected]>
 Tristan Berger <[email protected]>
 Mathias Schreck <[email protected]>
+Steven R. Loomis <[email protected]>
+Matthew Fitzsimmons <[email protected]>
+Swaagie <[email protected]>
+Emmanuel Odeke <[email protected]>
+Eric Mill <[email protected]>
+Brendan Ashworth <[email protected]>
+Alejandro Oviedo <[email protected]>
+pkcs <[email protected]>
+Saúl Ibarra Corretgé <[email protected]>
+silverwind <[email protected]>
+Steven R. Loomis <[email protected]>
+James M Snell <[email protected]>

ChangeLog

@@ -1,3 +1,172 @@
+2014.09.24, Version 0.11.14 (Unstable)
+
+* uv: Upgrade to v1.0.0-rc1
+
+* http_parser: Upgrade to v2.3.0
+
+* npm: Upgrade to v2.0.0
+
+* openssl: Upgrade to v1.0.1i
+
+* v8: Upgrade to 3.26.33
+
+* Add fast path for simple URL parsing (Gabriel Wicke)
+
+* Added support for options parameter in console.dir() (Xavi Magrinyà)
+
+* Cluster: fix shared handles on Windows (Alexis Campailla)
+
+* buffer: Fix incorrect Buffer.compare behavior (Feross Aboukhadijeh)
+
+* buffer: construct new buffer from buffer toJSON() output (cjihrig)
+
+* buffer: improve Buffer constructor (Kang-Hao Kenny)
+
+* build: linking CoreFoundation framework for OSX (Thorsten Lorenz)
+
+* child_process: accept uid/gid everywhere (Fedor Indutny)
+
+* child_process: add path to spawn ENOENT Error (Ryan Cole)
+
+* child_process: copy spawnSync() cwd option to proper buffer (cjihrig)
+
+* child_process: do not access stderr when stdio set to 'ignore' (cjihrig)
+
+* child_process: don't throw on EAGAIN (Charles)
+
+* child_process: don't throw on EMFILE/ENFILE (Ben Noordhuis)
+
+* child_process: use full path for cmd.exe on Win32 (Ed Morley)
+
+* cluster: allow multiple calls to setupMaster() (Ryan Graham)
+
+* cluster: centralize removal from workers list. (Julien Gilli)
+
+* cluster: enable error/message events using .worker (cjihrig)
+
+* cluster: include settings object in 'setup' event (Ryan Graham)
+
+* cluster: restore v0.10.x setupMaster() behaviour (Ryan Graham)
+
+* cluster: support options in Worker constructor (cjihrig)
+
+* cluster: test events emit on cluster.worker (Sam Roberts)
+
+* console: console.dir() accepts options object (Xavi Magrinyà)
+
+* crypto: add `honorCipherOrder` argument (Fedor Indutny)
+
+* crypto: allow padding in RSA methods (Fedor Indutny)
+
+* crypto: clarify RandomBytes() error msg (Mickael van der Beek)
+
+* crypto: never store pointer to conn in SSL_CTX (Fedor Indutny)
+
+* crypto: unsigned value can't be negative (Brian White)
+
+* dgram: remove new keyword from errnoException (Jackson Tian)
+
+* dns: always set variable family in lookup() (cjihrig)
+
+* dns: include host name in error message if available (Maciej Małecki)
+
+* dns: introduce lookupService function (Saúl Ibarra Corretgé)
+
+* dns: send lookup c-ares errors to callback (Chris Dickinson)
+
+* dns: throw if hostname is not string or falsey (cjihrig)
+
+* events: Output the event that is leaking (Arnout Kazemier)
+
+* fs: close file if fstat() fails in readFile() (cjihrig)
+
+* fs: fs.readFile should not throw uncaughtException (Jackson Tian)
+
+* http: add 308 status_code, see RFC7238 (Yazhong Liu)
+
+* http: don't default OPTIONS to chunked encoding (Nick Muerdter)
+
+* http: fix bailout for writeHead (Alex Kocharin)
+
+* http: remove unused code block (Fedor Indutny)
+
+* http: write() after end() emits an error. (Julien Gilli)
+
+* lib, src: add vm.runInDebugContext() (Ben Noordhuis)
+
+* lib: noisy deprecation of child_process customFds (Ryan Graham)
+
+* module: don't require fs several times (Robert Kowalski)
+
+* net,dgram: workers can listen on exclusive ports (cjihrig)
+
+* net,stream: add isPaused, don't read() when paused (Chris Dickinson)
+
+* net: Ensure consistent binding to IPV6 if address is absent (Raymond Feng)
+
+* net: add remoteFamily for socket (Jackson Tian)
+
+* net: don't emit listening if handle is closed (Eli Skeggs)
+
+* net: don't prefer IPv4 addresses during resolution (cjihrig)
+
+* net: don't throw on net.Server.close() (cjihrig)
+
+* net: reset `errorEmitted` on reconnect (Ed Umansky)
+
+* node: set names for prototype methods (Trevor Norris)
+
+* node: support v8 microtask queue (Vladimir Kurchatkin)
+
+* path: fix slice OOB in trim (Lucio M. Tato)
+
+* path: isAbsolute() should always return boolean (Herman Lee)
+
+* process: throw TypeError if kill pid not a number (Sam Roberts)
+
+* querystring: custom encode and decode (fengmk2)
+
+* querystring: do not add sep for empty array (cjihrig)
+
+* querystring: remove prepended ? from query field (Ezequiel Rabinovich)
+
+* readline: fix close event of readline.Interface() (Yazhong Liu)
+
+* readline: fixes scoping bug (Dan Kaplun)
+
+* readline: implements keypress buffering (Dan Kaplun)
+
+* repl: fix multi-line input (Fedor Indutny)
+
+* repl: fix overwrite for this._prompt (Yazhong Liu)
+
+* repl: proper `setPrompt()` and `multiline` support (Fedor Indutny)
+
+* stream: don't try to finish if buffer is not empty (Vladimir Kurchatkin)
+
+* stream: only end reading on null, not undefined (Jonathan Reem)
+
+* streams: set default hwm properly for Duplex (Andrew Oppenlander)
+
+* string_bytes: ucs2 support big endian (Andrew Low)
+
+* tls, crypto: add DHE support (Shigeki Ohtsu)
+
+* tls: `checkServerIdentity` option (Trevor Livingston)
+
+* tls: add DHE-RSA-AES128-SHA256 to the def ciphers (Shigeki Ohtsu)
+
+* tls: better error reporting at cert validation (Fedor Indutny)
+
+* tls: support multiple keys/certs (Fedor Indutny)
+
+* tls: throw an error, not string (Jackson Tian)
+
+* udp: make it possible to receive empty udp packets (Andrius Bentkus)
+
+* url: treat \ the same as / (isaacs)
+
+
 2014.05.01, Version 0.11.13 (Unstable), 99c9930ad626e2796af23def7cac19b65c608d18
 
 * v8: upgrade to 3.24.35.22
@@ -618,7 +787,60 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)
 
 
-2014.09.16, Version 0.10.32 (Stable)
+2014.12.22, Version 0.10.35 (Stable)
+
+* tls: re-add 1024-bit SSL certs removed by f9456a2 (Chris Dickinson)
+
+* timers: don't close interval timers when unrefd (Julien Gilli)
+
+* timers: don't mutate unref list while iterating it (Julien Gilli)
+
+
+2014.12.17, Version 0.10.34 (Stable), 52795f8fcc2de77cf997e671ea58614e5e425dfe
+
+* uv: update to v0.10.30
+
+* zlib: upgrade to v1.2.8
+
+* child_process: check execFile args is an array (Sam Roberts)
+
+* child_process: check fork args is an array (Sam Roberts)
+
+* crypto: update root certificates (Ben Noordhuis)
+
+* domains: fix issues with abort on uncaught (Julien Gilli)
+
+* timers: Avoid linear scan in _unrefActive. (Julien Gilli)
+
+* timers: fix unref() memory leak (Trevor Norris)
+
+* v8: add api for aborting on uncaught exception (Julien Gilli)
+
+* debugger: fix when using "use strict" (Julien Gilli)
+
+
+2014.10.20, Version 0.10.33 (Stable), 8d045a30e95602b443eb259a5021d33feb4df079
+
+* openssl: Update to 1.0.1j (Addressing multiple CVEs)
+
+* uv: Update to v0.10.29
+
+* child_process: properly support optional args (cjihrig)
+
+* crypto: Disable autonegotiation for SSLv2/3 by default (Fedor Indutny,
+	Timothy J Fontaine, Alexis Campailla)
+
+	This is a behavior change, by default we will not allow the negotiation to
+	SSLv2 or SSLv3. If you want this behavior, run Node.js with either
+	`--enable-ssl2` or `--enable-ssl3` respectively.
+
+	This does not change the behavior for users specifically requesting
+	`SSLv2_method` or `SSLv3_method`. While this behavior is not advised, it is
+	assumed you know what you're doing since you're specifically asking to use
+	these methods.
+
+
+2014.09.16, Version 0.10.32 (Stable), 0fe0d121551593c23a565db8397f85f17bb0f00e
 
 * npm: Update to 1.4.28
 
@@ -670,7 +892,7 @@
 
 * deps: backport 4ed5fde4f from v8 upstream (Fedor Indutny)
 
-* deps: cherry-pick eca441b2 from OpenSSL (Fedor Indutny)
+* 
 
 * lib: remove and restructure calls to isNaN() (cjihrig)
 

LICENSE

@@ -294,9 +294,9 @@ maintained libraries. The externally maintained libraries used by Node are:
 - Zlib at deps/zlib. zlib's license follows:
   """
     /* zlib.h -- interface of the 'zlib' general purpose compression library
-      version 1.2.4, March 14th, 2010
+      version 1.2.8, April 28th, 2013
 
-      Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+      Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
       This software is provided 'as-is', without any express or implied
       warranty.  In no event will the authors be held liable for any damages
@@ -314,9 +314,8 @@ maintained libraries. The externally maintained libraries used by Node are:
          misrepresented as being the original software.
       3. This notice may not be removed or altered from any source distribution.
 
-      Jean-loup Gailly
-      Mark Adler
-
+      Jean-loup Gailly        Mark Adler
+      [email protected]          [email protected]
     */
   """