Merge remote-tracking branch 'ry/v0.6' into v0.6-merge

Conflicts:
	AUTHORS
	ChangeLog
	Makefile
	doc/about/index.html
	doc/api/tls.markdown
	doc/community/index.html
	doc/index.html
	doc/logos/index.html
	doc/template.html
	lib/http.js
	lib/tls.js
	src/node_version.h
	src/platform_win32.cc
	test/simple/test-tls-connect-given-socket.js

diff --cc AUTHORS
index 509e8be,3afd5f5..e5c8201
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -261,5 -261,8 +261,8 @@@ Brandon Benvie <brandon@bbenvie.com
  Nicolas LaCasse <nlacasse@borderstylo.com>
  Dan VerWeire <dverweire@gmail.com>
  Matthew Fitzsimmons <matt@joyent.com>
 -Paddy Byers <paddy.byers@gmail.com>
  Philip Tellis <philip.tellis@gmail.com>
  Christopher Jeffrey <chjjeffrey@gmail.com>
++Paddy Byers <paddy.byers@gmail.com>
+ Seth Fitzsimmons <seth@mojodna.net>
+ Einar Otto Stangvik <einaros@gmail.com>

diff --cc ChangeLog
index 6ef1ef1,f4b5fc5..b5306ae
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,103 -1,44 +1,143 @@@
 -2012.02.17 Version 0.6.11 (stable)
 +2012.02.14, Version 0.7.4 (unstable)
 +
 +* Upgrade V8 to 3.9.5
 +
 +* Upgrade npm to 1.1.1
 +
 +* build: Detect host_arch better (Karl Skomski)
 +
 +* debugger: export `debug_port` to `process` (Fedor Indutny)
 +
 +* api docs: CSS bug fixes (isaacs)
 +
 +* build: use -fPIC for native addons on UNIX (Nathan Rajlich)
 +
 +* Re-add top-level v8::Locker (Marcel Laverdet)
 +
 +* Move images out of the dist tarballs (isaacs)
 +
 +* libuv: Remove uv_export and uv_import (Ben Noordhuis)
 +
 +* build: Support x64 build on Windows (Igor Zinkovsky)
 +
 +
 +2012.02.07, Version 0.7.3 (unstable), 99059aad8d654acda4abcfaa68df182b50f2ec90
 +
 +* Upgrade V8 to 3.9.2
 +
 +* Revert support for isolates. (Ben Noordhuis)
 +
 +* cluster: Cleanup docs, event handling, and process.disconnect (Andreas Madsen)
 +
 +* gyp_addon: link with node.lib on Windows (Nathan Rajlich)
 +
 +* http: fix case where http-parser is freed twice (koichik)
 +
 +* Windows: disable RTTI and exceptions (Bert Belder)
 +
 +
 +2012.02.01, Version 0.7.2 (unstable), ec79acb3a6166e30f0bf271fbbfda1fb575b3321
 +
 +* Update V8 to 3.8.9
 +
 +* Support for sharing streams across Isolates (Igor Zinkovsky)
 +
 +* #2636 - Fix case where http_parsers are freed too early (koichik)
 +
 +* url: Support for IPv6 addresses in URLs (Łukasz Walukiewicz)
 +
 +* child_process: Add disconnect() method to child processes (Andreas Madsen)
 +
 +* fs: add O_EXCL support, exclusive open file (Ben Noordhuis)
 +
 +* fs: more specific error messages (Tj Holowaychuk)
 +
 +* tty: emit 'unknown' key event if key sequence not found (Dan VerWeire, Nathan Rajlich)
 +
 +* build: compile release build too if BUILDTYPE=Debug (Ben Noordhuis)
 +
 +* module: fix --debug-brk on symlinked scripts (Fedor Indutny)
 +
 +* zlib: fix `Failed to set dictionary` issue (Fedor Indutny)
 +
 +* waf: predict target arch for OS X (Fedor Indutny)
 +
 +
 +2012.01.23, Version 0.7.1 (unstable), a74354735ab5d5b0fa35a1e4ff7e653757d2069b
 +
 +* Update V8 to 3.8.8
 +
 +* Install node-waf by default (Fedor Indutny)
 +
 +* crypto: Add ability to turn off PKCS padding (Ingmar Runge)
 +
 +* v8: implement VirtualMemory class on SunOS (Ben Noordhuis)
 +
 +* Add cluster.setupMaster (Andreas Madsen)
 +
 +* move `path.exists*` to `fs.exists*` (Maciej Małecki)
 +
 +* typed arrays: set class name (Ben Noordhuis)
 +
 +* libuv bug fixes (Igor Zinkovsky, Ben Noordhuis, Dan VerWeire)
 +
 +
 +2012.01.16, Version 0.7.0 (unstable), 9cc55dca6f67a6096c858b841c677b0593404321
 +
 +* Upgrade V8 to 3.8.6
 +
 +* Use GYP build system on unix (Ben Noordhuis)
 +
 +* Experimenetal isolates support (Ben Noordhuis)
 +
 +* Improvements to Cluster API (Andreas Madsen)
 +
 +* Use isolates for internal debugger (Fedor Indutny)
 +
 +* Bug fixes
 +
 +
- 2012.02.02, Version 0.6.10 (stable)
++2012.02.17 Version 0.6.11 (stable), 1eb1fe32250fc88cb5b0a97cddf3e02be02e3f4a
+ 
+ * http: allow multiple WebSocket RFC6455 headers (Einar Otto Stangvik)
+ 
+ * http: allow multiple WWW-Authenticate headers (Ben Noordhuis)
+ 
+ * windows: support unicode argv and environment variables (Bert Belder)
+ 
+ * tls: mitigate session renegotiation attacks (Ben Noordhuis)
+ 
+ * tcp, pipe: don't assert on uv_accept() errors (Ben Noordhuis)
+ 
+ * tls: Allow establishing secure connection on the existing socket (koichik)
+ 
+ * dgram: handle close of dgram socket before DNS lookup completes (Seth Fitzsimmons)
+ 
+ * windows: Support half-duplex pipes (Igor Zinkovsky)
+ 
+ * build: disable omit-frame-pointer on solaris systems (Dave Pacheco)
+ 
+ * debugger: fix --debug-brk (Ben Noordhuis)
+ 
+ * net: fix large file downloads failing (koichik)
+ 
+ * fs: fix ReadStream failure to read from existing fd (Christopher Jeffrey)
+ 
+ * net: destroy socket on DNS error (Stefan Rusu)
+ 
+ * dtrace: add missing translator (Dave Pacheco)
+ 
+ * unix: don't flush tty on switch to raw mode (Ben Noordhuis)
+ 
+ * windows: reset brightness when reverting to default text color (Bert Belder)
+ 
+ * npm: update to 1.1.1
+   - Update which, fstream, mkdirp, request, and rimraf
+   - Fix #2123 Set path properly for lifecycle scripts on windows
+   - Mark the root as seen, so we don't recurse into it. Fixes #1838. (Martin Cooper)
+ 
+ 
+ 2012.02.02, Version 0.6.10 (stable), 051908e023f87894fa68f5b64d0b99a19a7db01e
  
  * Update V8 to 3.6.6.20
  

diff --cc doc/about/index.html
Simple merge

diff --cc doc/api/tls.markdown
Simple merge

diff --cc doc/community/index.html
Simple merge

diff --cc doc/index.html
Simple merge

diff --cc doc/logos/index.html
index 3e78978,6f75a0e..1b36f3a
--- 1/doc/logos/index.html
--- 2/doc/logos/index.html
+++ b/doc/logos/index.html
@@@ -85,13 -82,10 +82,10 @@@
              <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
          </ul>
  
 -        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.11/LICENSE">View License</a></p>
 +        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.7.4/LICENSE">View License</a></p>
      </div>
  
- 
- 
- 
-     <script type="text/javascript">
+     <script>
        var gaJsHost = (("https:" == document.location.protocol) ?
        "https://ssl." : "http://www.");
        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

diff --cc lib/http.js
Simple merge

diff --cc lib/path.js
Simple merge

diff --cc lib/repl.js
Simple merge

diff --cc lib/tls.js
Simple merge

diff --cc node.gyp
Simple merge

diff --cc src/node.cc
Simple merge

diff --cc src/node_crypto.cc
Simple merge

diff --cc vcbuild.bat
Simple merge