nodejs · mmarchini · Feb 7, 2018 · Feb 20, 2018 · Feb 21, 2018 · Feb 10, 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/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/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/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/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
 ----------

diff --git a/deps/uv/docs/src/loop.rst b/deps/uv/docs/src/loop.rst
@@ -219,7 +219,7 @@ API
 
  .. caution::
 
- Any previous value returned from :c:func`uv_backend_fd` is now
+ Any previous value returned from :c:func:`uv_backend_fd` is now
  invalid. That function must be called again to determine the
  correct backend file descriptor.
 

diff --git a/deps/uv/docs/src/threading.rst b/deps/uv/docs/src/threading.rst
@@ -131,8 +131,15 @@ Functions return 0 on success or an error code < 0 (unless the
 return type is void, of course).
 
 .. note::
- Callers should be prepared to deal with spurious wakeups on :c:func:`uv_cond_wait` and
- :c:func:`uv_cond_timedwait`.
+ 1. Callers should be prepared to deal with spurious wakeups on :c:func:`uv_cond_wait`
+ and :c:func:`uv_cond_timedwait`.
+ 2. The timeout parameter for :c:func:`uv_cond_timedwait` is relative to the time
+ at which function is called.
+ 3. On z/OS, the timeout parameter for :c:func:`uv_cond_timedwait` is converted to an
+ absolute system time at which the wait expires. If the current system clock time
+ passes the absolute time calculated before the condition is signaled, an ETIMEDOUT
+ error results. After the wait begins, the wait time is not affected by changes
+ to the system clock.
 
 .. c:function:: int uv_cond_init(uv_cond_t* cond)
 .. c:function:: void uv_cond_destroy(uv_cond_t* cond)

diff --git a/deps/uv/docs/src/timer.rst b/deps/uv/docs/src/timer.rst
@@ -45,6 +45,8 @@ API
  .. note::
  Does not update the event loop's concept of "now". See :c:func:`uv_update_time` for more information.
 
+ If the timer is already active, it is simply updated.
+
 .. c:function:: int uv_timer_stop(uv_timer_t* handle)
 
  Stop the timer, the callback will not be called anymore.

diff --git a/deps/uv/gyp_uv.py b/deps/uv/gyp_uv.py
@@ -43,28 +43,7 @@ def run_gyp(args):
 
 if __name__ == '__main__':
  args = sys.argv[1:]
-
- # GYP bug.
- # On msvs it will crash if it gets an absolute path.
- # On Mac/make it will crash if it doesn't get an absolute path.
- if sys.platform == 'win32':
- args.append(os.path.join(uv_root, 'uv.gyp'))
- common_fn = os.path.join(uv_root, 'common.gypi')
- options_fn = os.path.join(uv_root, 'options.gypi')
- # we force vs 2010 over 2008 which would otherwise be the default for gyp
- if not os.environ.get('GYP_MSVS_VERSION'):
- os.environ['GYP_MSVS_VERSION'] = '2010'
- else:
- args.append(os.path.join(os.path.abspath(uv_root), 'uv.gyp'))
- common_fn = os.path.join(os.path.abspath(uv_root), 'common.gypi')
- options_fn = os.path.join(os.path.abspath(uv_root), 'options.gypi')
-
- if os.path.exists(common_fn):
- args.extend(['-I', common_fn])
-
- if os.path.exists(options_fn):
- args.extend(['-I', options_fn])
-
+ args.extend('-I common.gypi test/test.gyp'.split(' '))
  args.append('--depth=' + uv_root)
 
  # There's a bug with windows which doesn't allow this feature.