nodejs · addaleax · Feb 20, 2018 · Feb 21, 2018 · Feb 10, 2018 · Feb 12, 2018
diff --git a/.gitignore b/.gitignore
@@ -122,3 +122,8 @@ deps/uv/docs/src/guide/
 
 # do not override V8's .gitignore
 !deps/v8/**
+# ignore VS compiler output unhandled by V8's .gitignore
+deps/v8/src/Debug/
+deps/v8/src/Release/
+deps/v8/src/inspector/Debug/
+deps/v8/src/inspector/Release/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,7 +29,8 @@ release.
 </tr>
 <tr>
  <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V9.md#9.6.1">9.6.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V9.md#9.7.0">9.7.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V9.md#9.6.1">9.6.1</a><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/>

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -21,6 +21,7 @@
  - [Deprecations](#deprecations)
  - [Involving the TSC](#involving-the-tsc)
 * [Landing Pull Requests](#landing-pull-requests)
+ - [Using `git-node`](#using-git-node)
  - [Technical HOWTO](#technical-howto)
  - [Troubleshooting](#troubleshooting)
  - [I Just Made a Mistake](#i-just-made-a-mistake)
@@ -454,6 +455,26 @@ Additionally:
 - All commits should be self-contained (meaning every commit should pass all
  tests). This makes it much easier when bisecting to find a breaking change.
 
+### Using `git-node`
+
+In most cases, using [the `git-node` command][git-node] of [`node-core-utils`][]
+should be enough to help you land a Pull Request. If you discover a problem when
+using this tool, please file an issue
+[to the issue tracker][node-core-utils-issues].
+
+Quick example:
+
+```text
+$ npm install -g node-core-utils
+$ git node land $PRID
+```
+
+If it's the first time you ever use `node-core-utils`, you will be prompted
+to type the password of your GitHub account in the console so the tool can
+create the GitHub access token for you. If you do not want to do that, follow
+[the guide of `node-core-utils`][node-core-utils-credentials]
+to set up your credentials manually.
+
 ### Technical HOWTO
 
 Clear any `am`/`rebase` that may already be underway:
@@ -569,7 +590,8 @@ commit logs, ensure that they are properly formatted, and add
 
 <a name="metadata"></a>
 * Modify the original commit message to include additional metadata regarding
- the change process. ([`node-core-utils`][] fetches the metadata for you.)
+ the change process. (The [`git node metadata`][git-node-metadata] command
+ can generate the metadata for you.)
 
  * Required: A `PR-URL:` line that references the *full* GitHub URL of the
  original pull request being merged so it's easy to trace a commit back to
@@ -748,6 +770,10 @@ LTS working group and the Release team.
 [Stability Index]: doc/api/documentation.md#stability-index
 [Enhancement Proposal]: https://github.com/nodejs/node-eps
 [`--pending-deprecation`]: doc/api/cli.md#--pending-deprecation
+[git-node]: https://github.com/nodejs/node-core-utils/blob/master/docs/git-node.md
+[git-node-metadata]: https://github.com/nodejs/node-core-utils/blob/master/docs/git-node.md#git-node-metadata
 [git-username]: https://help.github.com/articles/setting-your-username-in-git/
 [`node-core-utils`]: https://github.com/nodejs/node-core-utils
 [TSC]: https://github.com/nodejs/TSC
+[node-core-utils-issues]: https://github.com/nodejs/node-core-utils/issues
+[node-core-utils-credentials]: https://github.com/nodejs/node-core-utils#setting-up-credentials
diff --git a/Makefile b/Makefile
@@ -191,6 +191,9 @@ coverage-test: coverage-build
  $(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
  $(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
  $(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
+ $(RM) out/$(BUILDTYPE)/obj.target/node_lib/gen/*.gcda
+ $(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
+ $(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda
  -$(MAKE) $(COVTESTS)
  mv lib lib__
  mv lib_ lib
@@ -201,7 +204,7 @@ coverage-test: coverage-build
  --temp-directory "$(CURDIR)/.cov_tmp" \
  --report-dir "../coverage")
  -(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
- --gcov-exclude='.*usr' -v -r Release/obj.target/node \
+ --gcov-exclude='.*usr' -v -r Release/obj.target \
  --html --html-detail -o ../coverage/cxxcoverage.html \
  --gcov-executable="$(GCOV)")
  mv lib lib_

diff --git a/README.md b/README.md
@@ -3,9 +3,6 @@
  <img alt="Node.js" src="https://nodejs.org/static/images/logo-light.svg" width="400"/>
  </a>
 </p>
-<p align="center">
- <a title="CII Best Practices" href="https://bestpractices.coreinfrastructure.org/projects/29"><img src="https://bestpractices.coreinfrastructure.org/projects/29/badge"></a>
-</p>
 
 Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. For
 more information on using Node.js, see the

diff --git a/benchmark/net/tcp-raw-c2s.js b/benchmark/net/tcp-raw-c2s.js
@@ -118,7 +118,7 @@ function client(type, len) {
  fail(err, 'write');
  }
 
- function afterWrite(err, handle, req) {
+ function afterWrite(err, handle) {
  if (err)
  fail(err, 'write');
 

diff --git a/benchmark/net/tcp-raw-pipe.js b/benchmark/net/tcp-raw-pipe.js
@@ -51,7 +51,7 @@ function main({ dur, len, type }) {
  if (err)
  fail(err, 'write');
 
- writeReq.oncomplete = function(status, handle, req, err) {
+ writeReq.oncomplete = function(status, handle, err) {
  if (err)
  fail(err, 'write');
  };
@@ -130,7 +130,7 @@ function main({ dur, len, type }) {
  fail(err, 'write');
  }
 
- function afterWrite(err, handle, req) {
+ function afterWrite(err, handle) {
  if (err)
  fail(err, 'write');
 

diff --git a/benchmark/net/tcp-raw-s2c.js b/benchmark/net/tcp-raw-s2c.js
@@ -74,14 +74,14 @@ function main({ dur, len, type }) {
  fail(err, 'write');
  } else if (!writeReq.async) {
  process.nextTick(function() {
- afterWrite(null, clientHandle, writeReq);
+ afterWrite(0, clientHandle);
  });
  }
  }
 
- function afterWrite(status, handle, req, err) {
- if (err)
- fail(err, 'write');
+ function afterWrite(status, handle) {
+ if (status)
+ fail(status, 'write');
 
  while (clientHandle.writeQueueSize === 0)
  write();

diff --git a/benchmark/streams/pipe-object-mode.js b/benchmark/streams/pipe-object-mode.js
@@ -0,0 +1,24 @@
+'use strict';
+
+const common = require('../common');
+const { Readable, Writable } = require('stream');
+
+const bench = common.createBenchmark(main, {
+ n: [5e6]
+});
+
+function main({ n }) {
+ const b = {};
+ const r = new Readable({ objectMode: true });
+ const w = new Writable({ objectMode: true });
+
+ var i = 0;
+
+ r._read = () => r.push(i++ === n ? null : b);
+ w._write = (data, enc, cb) => cb();
+
+ bench.start();
+
+ r.pipe(w);
+ w.on('finish', () => bench.end(n));
+}
diff --git a/benchmark/streams/pipe.js b/benchmark/streams/pipe.js
@@ -0,0 +1,24 @@
+'use strict';
+
+const common = require('../common');
+const { Readable, Writable } = require('stream');
+
+const bench = common.createBenchmark(main, {
+ n: [5e6]
+});
+
+function main({ n }) {
+ const b = new Buffer(1024);
+ const r = new Readable();
+ const w = new Writable();
+
+ var i = 0;
+
+ r._read = () => r.push(i++ === n ? null : b);
+ w._write = (data, enc, cb) => cb();
+
+ bench.start();
+
+ r.pipe(w);
+ w.on('finish', () => bench.end(n));
+}
diff --git a/benchmark/url/url-parse.js b/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);
+}
diff --git a/common.gypi b/common.gypi
@@ -44,29 +44,29 @@
 
  'conditions': [
  ['GENERATOR=="ninja"', {
- 'OBJ_DIR': '<(PRODUCT_DIR)/obj',
- 'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
+ 'obj_dir': '<(PRODUCT_DIR)/obj',
+ 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
  }, {
- 'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
- 'V8_BASE%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
+ 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+ 'v8_base%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
  }],
  ['OS == "win"', {
  'os_posix': 0,
  'v8_postmortem_support%': 'false',
- 'OBJ_DIR': '<(PRODUCT_DIR)/obj',
- 'V8_BASE': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
+ 'obj_dir': '<(PRODUCT_DIR)/obj',
+ 'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
  }, {
  'os_posix': 1,
  'v8_postmortem_support%': 'true',
  }],
  ['OS== "mac"', {
- 'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
- 'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
+ 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+ 'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
  }],
  ['openssl_fips != ""', {
- 'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
+ 'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
  }, {
- 'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
+ 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
  }],
  ['OS=="mac"', {
  'clang%': 1,

diff --git a/deps/nghttp2/lib/includes/config.h b/deps/nghttp2/lib/includes/config.h
@@ -1,8 +1,18 @@
 /* Hint to the compiler that a function never returns */
 #define NGHTTP2_NORETURN
 
-/* Define to `int' if <sys/types.h> does not define. */
-#define ssize_t int
+/* Edited to match src/node.h. */
+#include <stdint.h>
+
+#ifdef _WIN32
+#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
+typedef intptr_t ssize_t;
+# define _SSIZE_T_
+# define _SSIZE_T_DEFINED
+#endif
+#else // !_WIN32
+# include <sys/types.h> // size_t, ssize_t
+#endif // _WIN32
 
 /* Define to 1 if you have the `std::map::emplace`. */
 #define HAVE_STD_MAP_EMPLACE 1

diff --git a/deps/uv/AUTHORS b/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>
diff --git a/deps/uv/ChangeLog b/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:

diff --git a/deps/uv/SUPPORTED_PLATFORMS.md b/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 | |

diff --git a/deps/uv/common.gypi b/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

diff --git a/deps/uv/configure.ac b/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])

diff --git a/deps/uv/docs/src/handle.rst b/deps/uv/docs/src/handle.rst
@@ -9,6 +9,9 @@
 Structures are aligned so that any libuv handle can be cast to `uv_handle_t`.
 All API functions defined here work with any handle type.
 
+Libuv handles are not movable. Pointers to handle structures passed to
+functions must remain valid for the duration of the requested operation. Take
+care when using stack allocated handles.
 
 Data types
 ----------