meta: merge node/master into node-chakracore/master

Merge a29089d as of 2018-02-23
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>

Author: chakrabot

BUILDING.md

@@ -34,8 +34,8 @@ Support is divided into three tiers:
 ### Supported platforms
 
 The community does not build or test against end-of-life distributions (EoL).
-Thus we do not recommend that you use Node on end-of-life or unsupported platforms
-in production.
+Thus we do not recommend that you use Node on end-of-life or unsupported
+platforms in production.
 
 |  System      | Support type | Version                          | Architectures        | Notes            |
 |--------------|--------------|----------------------------------|----------------------|------------------|
@@ -107,9 +107,11 @@ installed, you can find them under the menu `Xcode -> Open Developer Tool ->
 More Developer Tools...`. This step will install `clang`, `clang++`, and
 `make`.
 * After building, you may want to setup [firewall rules](tools/macosx-firewall.sh)
-to avoid popups asking to accept incoming network connections when running tests:
+to avoid popups asking to accept incoming network connections when running
+tests:
 
-If the path to your build directory contains a space, the build will likely fail.
+If the path to your build directory contains a space, the build will likely
+fail.
 
 ```console
 $ sudo ./tools/macosx-firewall.sh
@@ -232,8 +234,8 @@ Prerequisites:
 * **Optional** (to build the MSI): the [WiX Toolset v3.11](http://wixtoolset.org/releases/)
   and the [Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension).
 
-If the path to your build directory contains a space or a non-ASCII character, the
-build will likely fail.
+If the path to your build directory contains a space or a non-ASCII character,
+the build will likely fail.
 
 ```console
 > .\vcbuild

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Node.js Changelog
 
+<!--lint disable maximum-line-length-->
+
 To make the changelog easier to both use and manage, it has been split into
 multiple files organized according to significant major and minor Node.js
 release lines.
@@ -29,7 +31,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V9.md#9.6.0">9.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V9.md#9.6.1">9.6.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V9.md#9.6.0">9.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.5.0">9.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.4.0">9.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.3.0">9.3.0</a><br/>

COLLABORATOR_GUIDE.md

@@ -154,22 +154,23 @@ The pull request should have a CI status indicator if possible.
 #### Useful CI Jobs
 
 * [`node-test-pull-request`](https://ci.nodejs.org/job/node-test-pull-request/)
-is the standard CI run we do to check Pull Requests. It triggers `node-test-commit`,
-which runs the `build-ci` and `test-ci` targets on all supported platforms.
+is the standard CI run we do to check Pull Requests. It triggers
+`node-test-commit`, which runs the `build-ci` and `test-ci` targets on all
+supported platforms.
 
 * [`node-test-linter`](https://ci.nodejs.org/job/node-test-linter/)
-only runs the linter targets, which is useful for changes that only affect comments
-or documentation.
+only runs the linter targets, which is useful for changes that only affect
+comments or documentation.
 
 * [`node-test-pull-request-lite`](https://ci.nodejs.org/job/node-test-pull-request-lite/)
-only runs the linter job, as well as the tests on LinuxONE. Should only be used for
-trivial changes that do not require being tested on all platforms.
+only runs the linter job, as well as the tests on LinuxONE. Should only be used
+for trivial changes that do not require being tested on all platforms.
 
 * [`citgm-smoker`](https://ci.nodejs.org/job/citgm-smoker/)
-uses [`CitGM`](https://github.com/nodejs/citgm) to allow you to run `npm install && npm test`
-on a large selection of common modules. This is useful to check whether a
-change will cause breakage in the ecosystem. To test Node.js ABI changes
-you can run [`citgm-abi-smoker`](https://ci.nodejs.org/job/citgm-abi-smoker/).
+uses [`CitGM`](https://github.com/nodejs/citgm) to allow you to run
+`npm install && npm test` on a large selection of common modules. This is
+useful to check whether a change will cause breakage in the ecosystem. To test
+Node.js ABI changes you can run [`citgm-abi-smoker`](https://ci.nodejs.org/job/citgm-abi-smoker/).
 
 * [`node-stress-single-test`](https://ci.nodejs.org/job/node-stress-single-test/)
 is designed to allow one to run a group of tests over and over on a specific
@@ -483,17 +484,18 @@ Apply external patches:
 $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fix
 ```
 
-If the merge fails even though recent CI runs were successful, then a 3-way merge may
-be required.  In this case try:
+If the merge fails even though recent CI runs were successful, then a 3-way
+merge may be required.  In this case try:
 
 ```text
 $ git am --abort
 $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am -3 --whitespace=fix
 ```
 If the 3-way merge succeeds you can proceed, but make sure to check the changes
 against the original PR carefully and build/test on at least one platform
-before landing. If the 3-way merge fails, then it is most likely that a conflicting
-PR has landed since the CI run and you will have to ask the author to rebase.
+before landing. If the 3-way merge fails, then it is most likely that a
+conflicting PR has landed since the CI run and you will have to ask the author
+to rebase.
 
 Check and re-review the changes:
 

GOVERNANCE.md

@@ -159,9 +159,9 @@ repository, with a summary of the nominee's contributions, for example:
 * Participation in other projects, teams, and working groups of the
   Node.js organization
   * Can be shown using the links
-    `https://github.com/search?q=author%3A${GITHUB_ID}++org%3Anodejs&type=Issues`
+  `https://github.com/search?q=author%3A${GITHUB_ID}++org%3Anodejs&type=Issues`
     and
-    `https://github.com/search?q=commenter%3A${GITHUB_ID}++org%3Anodejs&type=Issues`
+`https://github.com/search?q=commenter%3A${GITHUB_ID}++org%3Anodejs&type=Issues`
 * Other participation in the wider Node.js community
 
 Mention @nodejs/collaborators in the issue to notify other Collaborators about

benchmark/url/url-parse.js

@@ -0,0 +1,22 @@
+'use strict';
+const common = require('../common.js');
+const url = require('url');
+
+const inputs = {
+  normal: 'http://foo.com/bar',
+  escaped: 'https://foo.bar/{}^`/abcd'
+};
+
+const bench = common.createBenchmark(main, {
+  type: Object.keys(inputs),
+  n: [1e7]
+});
+
+function main({ type, n }) {
+  const input = inputs[type] || '';
+
+  bench.start();
+  for (var i = 0; i < n; i += 1)
+    url.parse(input);
+  bench.end(n);
+}

deps/uv/AUTHORS

@@ -325,3 +325,8 @@ Anna Henningsen <anna@addaleax.net>
 Jérémy Lal <kapouer@melix.org>
 Ben Wijen <ben@wijen.net>
 elephantp <elephantp@elephantp.blog>
+Felix Yan <felixonmars@archlinux.org>
+Mason X <me@masonx.ca>
+Jesse Gorzinski <jgorzinski@gmail.com>
+Ryuichi KAWAMATA <ryuichi.kawamata@dena.jp>
+Joyee Cheung <joyeec9h3@gmail.com>

deps/uv/ChangeLog

@@ -1,3 +1,48 @@
+2018.02.22, Version 1.19.2 (Stable), c5afc37e2a8a70d8ab0da8dac10b77ba78c0488c
+
+Changes since version 1.19.1:
+
+* test: fix incorrect asserts (cjihrig)
+
+* test: fix a typo in test-fork.c (Felix Yan)
+
+* build: remove long-obsolete gyp workarounds (Ben Noordhuis)
+
+* build: split off tests into separate gyp file (Ben Noordhuis)
+
+* test: check uv_cond_timedwait more carefully (Jamie Davis)
+
+* include,src: introduce UV__ERR() macro (Mason X)
+
+* build: add url field to libuv.pc (Ben Noordhuis)
+
+* doc: mark IBM i as Tier 3 support (Jesse Gorzinski)
+
+* win,build: correct C2059 errors (Michael Fero)
+
+* zos: fix timeout for condition variable (jBarz)
+
+* win: CREATE_NO_WINDOW when stdio is not inherited (Nick Logan)
+
+* build: fix commmon.gypi comment (Ryuichi KAWAMATA)
+
+* doc: document uv_timer_start() on an active timer (Vladimír Čunát)
+
+* doc: add note about handle movability (Bartosz Sosnowski)
+
+* doc: fix syntax error in loop documentation (Bartosz Sosnowski)
+
+* osx,stream: retry sending handle on EMSGSIZE error (Santiago Gimeno)
+
+* unix: delay fs req register until after validation (cjihrig)
+
+* test: add tests for bad inputs (Joyee Cheung)
+
+* unix,win: ensure req->bufs is freed (cjihrig)
+
+* test: add additional fs memory management checks (cjihrig)
+
+
 2018.01.20, Version 1.19.1 (Stable), 8202d1751196c2374ad370f7f3779daef89befae
 
 Changes since version 1.19.0:

deps/uv/SUPPORTED_PLATFORMS.md

@@ -11,6 +11,7 @@
 | Linux with musl | Tier 2 | musl >= 1.0 | |
 | SmartOS | Tier 2 | >= 14.4 | Maintainers: @libuv/smartos |
 | Android | Tier 3 | NDK >= r15b | |
+| IBM i | Tier 3 | >= IBM i 7.2 | Maintainers: @libuv/ibmi |
 | MinGW | Tier 3 | MinGW32 and MinGW-w64 | |
 | SunOS | Tier 3 | Solaris 121 and later | |
 | Other | Tier 3 | N/A | |

deps/uv/common.gypi

@@ -16,9 +16,9 @@
           'VCCLCompilerTool': {
             'target_conditions': [
               ['uv_library=="static_library"', {
-                'RuntimeLibrary': 1, # static debug
+                'RuntimeLibrary': 1, # /MTd static debug
               }, {
-                'RuntimeLibrary': 3, # DLL debug
+                'RuntimeLibrary': 3, # /MDd DLL debug
               }],
             ],
             'Optimization': 0, # /Od, no optimization
@@ -52,9 +52,9 @@
           'VCCLCompilerTool': {
             'target_conditions': [
               ['uv_library=="static_library"', {
-                'RuntimeLibrary': 0, # static release
+                'RuntimeLibrary': 0, # /MT static release
               }, {
-                'RuntimeLibrary': 2, # debug release
+                'RuntimeLibrary': 2, # /MD DLL release
               }],
             ],
             'Optimization': 3, # /Ox, full optimization

deps/uv/configure.ac

@@ -13,7 +13,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libuv], [1.19.1], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.19.2], [https://github.com/libuv/libuv/issues])
 AC_CONFIG_MACRO_DIR([m4])
 m4_include([m4/libuv-extra-automake-flags.m4])
 m4_include([m4/as_case.m4])