Merge branch 'v0.8'

Conflicts:
	ChangeLog
	deps/openssl/openssl.gyp
	src/node_version.h

Author: piscisaureus

AUTHORS

@@ -356,3 +356,4 @@ Eugen Dueck <[email protected]>
 Gil Pedersen <[email protected]>
 Tyler Neylon <[email protected]>
 Golo Roden <[email protected]>
+Ron Korving <[email protected]>

ChangeLog

@@ -21,7 +21,32 @@
 * Fix #3521 Make process.env more like a regular Object (isaacs)
 
 
-2012.08.15, Version 0.8.7 (Stable)
+2012.08.22, Version 0.8.8 (Stable)
+
+* V8: upgrade to 3.11.10.19
+
+* npm: upgrade to 1.1.59
+
+* windows: fix uninitialized memory access in uv_update_time() (Bert Belder)
+
+* unix, windows: fix memory corruption in fs-poll.c (Ben Noordhuis)
+
+* unix: fix integer overflow in uv_hrtime (Tim Holy)
+
+* sunos: fix uv_cpu_info() on x86_64 (Ben Noordhuis)
+
+* tls: update default cipher list (Ben Noordhuis)
+
+* unix: Fix llvm and older gcc duplicate symbol warnings (Bert Belder)
+
+* fs: fix use after free in stat watcher (Ben Noordhuis)
+
+* build: Fix using manually compiled gcc on OS X (Nathan Rajlich)
+
+* windows: make junctions work again (Bert Belder)
+
+
+2012.08.15, Version 0.8.7 (Stable), f640c5d35cba96634cd8176a525a1d876e361a61
 
 * npm: Upgrade to 1.1.49
 

common.gypi

@@ -66,9 +66,12 @@
               }, {
                 'cflags!': [ '-ffunction-sections', '-fdata-sections' ],
               }],
-              ['clang==1 or gcc_version >= 40', {
+              ['clang == 0 and gcc_version >= 40', {
                 'cflags': [ '-fno-tree-vrp' ],
               }],
+              ['clang == 0 and gcc_version <= 44', {
+                'cflags': [ '-fno-tree-sink' ],
+              }],
             ],
           }],
           ['OS=="solaris"', {
@@ -190,7 +193,6 @@
           'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
           'GCC_THREADSAFE_STATICS': 'NO',           # -fno-threadsafe-statics
           'GCC_VERSION': '4.2',
-          'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
           'PREBINDING': 'NO',                       # No -Wl,-prebind
           'MACOSX_DEPLOYMENT_TARGET': '10.5',       # -mmacosx-version-min=10.5
           'USE_HEADERMAP': 'NO',

deps/npm/.travis.yml

@@ -75,3 +75,5 @@ Don Park <[email protected]>
 Kei Son <[email protected]>
 Nicolas Morel <[email protected]>
 Mark Dube <[email protected]>
+Maxim Bogushevich <[email protected]>
+Justin Beckwith <[email protected]>

deps/npm/AUTHORS

@@ -550,6 +550,15 @@ The url to report npat test results.
 A node module to `require()` when npm loads.  Useful for programmatic
 usage.
 
+### optional
+
+* Default: true
+* Type: Boolean
+
+Attempt to install packages in the `optionalDependencies` hash.  Note
+that if these packages fail to install, the overall installation
+process is not aborted.
+
 ### parseable
 
 * Default: false

deps/npm/doc/cli/config.md

@@ -0,0 +1,53 @@
+npm-dedupe(1) -- Reduce duplication
+===================================
+
+## SYNOPSIS
+
+    npm dedupe [package names...]
+
+## DESCRIPTION
+
+Searches the local package tree and attempts to simplify the overall
+structure by moving dependencies further up the tree, where they can
+be more effectively shared by multiple dependent packages.
+
+For example, consider this dependency graph:
+
+    a
+    +-- b <-- depends on [email protected]
+    |   `-- [email protected]
+    `-- d <-- depends on c@~1.0.9
+        `-- [email protected]
+
+In this case, `npm-dedupe(1)` will transform the tree to:
+
+    a
+    +-- b
+    +-- d
+    `-- [email protected]
+
+Because of the hierarchical nature of node's module lookup, b and d
+will both get their dependency met by the single c package at the root
+level of the tree.
+
+If a suitable version exists at the target location in the tree
+already, then it will be left untouched, but the other duplicates will
+be deleted.
+
+If no suitable version can be found, then a warning is printed, and
+nothing is done.
+
+If any arguments are supplied, then they are filters, and only the
+named packages will be touched.
+
+Note that this operation transforms the dependency tree, and may
+result in packages getting updated versions, perhaps from the npm
+registry.
+
+This feature is experimental, and may change in future versions.
+
+## SEE ALSO
+
+* npm-ls(1)
+* npm-update(1)
+* npm-install(1)

deps/npm/doc/cli/dedupe.md

@@ -46,6 +46,10 @@ npm-index(1) -- Index of all npm documentation
 
  Manage the npm configuration file
 
+## npm-dedupe(1)
+
+ Reduce duplication
+
 ## npm-deprecate(1)
 
  Deprecate a version of a package

deps/npm/doc/cli/index.md

@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This function should not be used programmatically.  Instead, just refer
 to the <code>npm.bin</code> member.</p>
 </div>
-<p id="footer">bin &mdash; [email protected].49</p>
+<p id="footer">bin &mdash; [email protected].59</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/api/bin.html

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">bugs &mdash; [email protected].49</p>
+<p id="footer">bugs &mdash; [email protected].59</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")