Backport 7373: vm: fix nested timeouts with inverse order + fix flaky test-vm-timeout

CONTRIBUTING.md

@@ -151,6 +151,9 @@ $ ./configure && make -j8 test
 Make sure the linter is happy and that all tests pass. Please, do not submit
 patches that fail either check.
 
+Running `make test` will run the linter as well unless one or more tests fail.
+If you want to run the linter without running tests, use `make lint`.
+
 If you are updating tests and just want to run a single test to check it, you
 can use this syntax to run it exactly as the test harness would:
 

Makefile

@@ -108,7 +108,7 @@ cctest: all
 
 v8:
 	tools/make-v8.sh v8
-	$(MAKE) -C deps/v8 $(V8_ARCH) $(V8_BUILD_OPTIONS)
+	$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
 
 test: | cctest  # Depends on 'all'.
 	$(PYTHON) tools/test.py --mode=release doctool message pseudo-tty parallel sequential -J
@@ -227,22 +227,22 @@ test-timers:
 test-timers-clean:
 	$(MAKE) --directory=tools clean
 
-test-v8:
+test-v8: v8
 	# note: performs full test unless QUICKCHECK is specified
 	deps/v8/tools/run-tests.py --arch=$(V8_ARCH) \
         --mode=$(BUILDTYPE_LOWER) $(V8_TEST_NO_I18N) $(QUICKCHECK_ARG) \
         --no-presubmit \
         --shell-dir=$(PWD)/deps/v8/out/$(V8_ARCH).$(BUILDTYPE_LOWER) \
 	 $(TAP_V8)
 
-test-v8-intl:
+test-v8-intl: v8
 	# note: performs full test unless QUICKCHECK is specified
 	deps/v8/tools/run-tests.py --arch=$(V8_ARCH) \
         --mode=$(BUILDTYPE_LOWER) --no-presubmit $(QUICKCHECK_ARG) \
         --shell-dir=deps/v8/out/$(V8_ARCH).$(BUILDTYPE_LOWER) intl \
         $(TAP_V8_INTL)
 
-test-v8-benchmarks:
+test-v8-benchmarks: v8
 	deps/v8/tools/run-tests.py --arch=$(V8_ARCH) --mode=$(BUILDTYPE_LOWER) \
         --download-data $(QUICKCHECK_ARG) --no-presubmit \
         --shell-dir=deps/v8/out/$(V8_ARCH).$(BUILDTYPE_LOWER) benchmarks \

README.md

@@ -170,6 +170,7 @@ information about the governance of the Node.js project, see
 * [benjamingr](https://github.com/benjamingr) - **Benjamin Gruenbaum** <benjamingr@gmail.com>
 * [bmeck](https://github.com/bmeck) - **Bradley Farias** <bradley.meck@gmail.com>
 * [brendanashworth](https://github.com/brendanashworth) - **Brendan Ashworth** <brendan.ashworth@me.com>
+* [bzoz](https://github.com/bzoz) - **Bartosz Sosnowski** <bartosz@janeasystems.com>
 * [calvinmetcalf](https://github.com/calvinmetcalf) - **Calvin Metcalf** <calvin.metcalf@gmail.com>
 * [claudiorodriguez](https://github.com/claudiorodriguez) - **Claudio Rodriguez** <cjrodr@yahoo.com>
 * [domenic](https://github.com/domenic) - **Domenic Denicola** <d@domenic.me>
@@ -186,6 +187,7 @@ information about the governance of the Node.js project, see
 * [joaocgreis](https://github.com/joaocgreis) - **João Reis** <reis@janeasystems.com>
 * [julianduque](https://github.com/julianduque) - **Julian Duque** <julianduquej@gmail.com>
 * [JungMinu](https://github.com/JungMinu) - **Minwoo Jung** <jmwsoft@gmail.com>
+* [lance](https://github.com/lance) - **Lance Ball** <lball@redhat.com>
 * [lxe](https://github.com/lxe) - **Aleksey Smolenchuk** <lxe@lxe.co>
 * [matthewloring](https://github.com/matthewloring) - **Matthew Loring** <mattloring@google.com>
 * [mcollina](https://github.com/mcollina) - **Matteo Collina** <matteo.collina@gmail.com>

benchmark/http/_chunky_http_client.js

@@ -50,8 +50,6 @@ function main(conf) {
     }
   }
 
-  var success = 0;
-  var failure = 0;
   var min = 10;
   var size = 0;
   var mod = 317;
@@ -69,14 +67,12 @@ function main(conf) {
       if ((d.length === pattern.length && d === pattern) ||
           (d.length > pattern.length &&
            d.slice(0, pattern.length) === pattern)) {
-        success += 1;
         did = true;
       } else {
         pattern = 'HTTP/1.1 ';
         if ((d.length === pattern.length && d === pattern) ||
             (d.length > pattern.length &&
              d.slice(0, pattern.length) === pattern)) {
-          failure += 1;
           did = true;
         }
       }

benchmark/static_http_server.js

@@ -6,7 +6,6 @@ var port = 12346;
 var n = 700;
 var bytes = 1024 * 5;
 
-var requests = 0;
 var responses = 0;
 
 var body = 'C'.repeat(bytes);
@@ -37,6 +36,5 @@ server.listen(port, function() {
       });
     });
     req.id = i;
-    requests++;
   }
 });

doc/api/child_process.md

@@ -160,8 +160,8 @@ The `stdout` and `stderr` arguments passed to the callback will contain the
 stdout and stderr output of the child process. By default, Node.js will decode
 the output as UTF-8 and pass strings to the callback. The `encoding` option
 can be used to specify the character encoding used to decode the stdout and
-stderr output. If `encoding` is `'buffer'`, `Buffer` objects will be passed to
-the callback instead.
+stderr output. If `encoding` is `'buffer'`, or an unrecognized character
+encoding, `Buffer` objects will be passed to the callback instead.
 
 The `options` argument may be passed as the second argument to customize how
 the process is spawned. The default options are:
@@ -230,8 +230,8 @@ The `stdout` and `stderr` arguments passed to the callback will contain the
 stdout and stderr output of the child process. By default, Node.js will decode
 the output as UTF-8 and pass strings to the callback. The `encoding` option
 can be used to specify the character encoding used to decode the stdout and
-stderr output. If `encoding` is `'buffer'`, `Buffer` objects will be passed to
-the callback instead.
+stderr output. If `encoding` is `'buffer'`, or an unrecognized character
+encoding, `Buffer` objects will be passed to the callback instead.
 
 ### child_process.fork(modulePath[, args][, options])
 
@@ -414,7 +414,7 @@ const spawn = require('child_process').spawn;
 
 const child = spawn(process.argv[0], ['child_program.js'], {
   detached: true,
-  stdio: ['ignore']
+  stdio: 'ignore'
 });
 
 child.unref();

doc/api/cluster.md

@@ -167,12 +167,12 @@ It is not emitted in the worker.
 ### Event: 'message'
 
 * `message` {Object}
+* `handle` {undefined|Object}
 
-Similar to the `cluster.on('message')` event, but specific to this worker.
-
-This event is the same as the one provided by [`child_process.fork()`][].
+Similar to the `cluster.on('message')` event, but specific to this worker. In a
+worker you can also use `process.on('message')`.
 
-In a worker you can also use `process.on('message')`.
+See [`process` event: `'message'`][].
 
 As an example, here is a cluster that keeps count of the number of requests
 in the master process using the message system:
@@ -689,3 +689,4 @@ socket.on('data', (id) => {
 [Child Process module]: child_process.html#child_process_child_process_fork_modulepath_args_options
 [child_process event: 'exit']: child_process.html#child_process_event_exit
 [child_process event: 'message']: child_process.html#child_process_event_message
+[`process` event: `'message'`]: process.html#process_event_message

doc/api/crypto.md

@@ -794,7 +794,7 @@ verify.end();
 
 const public_key = getPublicKeySomehow();
 const signature = getSignatureToVerify();
-console.log(sign.verify(public_key, signature));
+console.log(verify.verify(public_key, signature));
   // Prints true or false
 ```
 

doc/api/dns.md

@@ -158,7 +158,9 @@ Valid values for `rrtype` are:
  * `'NAPTR'` - name authority pointer record
 
 The `callback` function has arguments `(err, addresses)`. When successful,
-`addresses` will be an array. The type of each  item in `addresses` is
+`addresses` will be an array, except when resolving an SOA record which returns
+an object structured in the same manner as one returned by the
+[`dns.resolveSoa()`][] method. The type of each item in `addresses` is
 determined by the record type, and described in the documentation for the
 corresponding lookup methods.
 
@@ -379,6 +381,7 @@ uses. For instance, _they do not use the configuration from `/etc/hosts`_.
 [`dns.lookup()`]: #dns_dns_lookup_hostname_options_callback
 [`dns.resolve()`]: #dns_dns_resolve_hostname_rrtype_callback
 [`dns.resolve4()`]: #dns_dns_resolve4_hostname_callback
+[`dns.resolveSoa()`]: #dns_dns_resolvesoa_hostname_callback
 [`Error`]: errors.html#errors_class_error
 [Implementation considerations section]: #dns_implementation_considerations
 [supported `getaddrinfo` flags]: #dns_supported_getaddrinfo_flags

doc/api/http.md

@@ -207,6 +207,13 @@ The request implements the [Writable Stream][] interface. This is an
 Emitted when the request has been aborted by the client. This event is only
 emitted on the first call to `abort()`.
 
+### Event: 'aborted'
+
+`function () { }`
+
+Emitted when the request has been aborted by the server and the network
+socket has closed.
+
 ### Event: 'connect'
 
 `function (response, socket, head) { }`
@@ -516,24 +523,24 @@ already been bound to a port or domain socket.
 
 Listening on a file descriptor is not supported on Windows.
 
-This function is asynchronous. The last parameter `callback` will be added as
-a listener for the `'listening'` event. See also [`net.Server.listen()`][].
+This function is asynchronous. `callback` will be added as a listener for the
+`'listening'` event. See also [`net.Server.listen()`][].
 
 Returns `server`.
 
 ### server.listen(path[, callback])
 
 Start a UNIX socket server listening for connections on the given `path`.
 
-This function is asynchronous. The last parameter `callback` will be added as
-a listener for the `'listening'` event.  See also [`net.Server.listen(path)`][].
+This function is asynchronous. `callback` will be added as a listener for the
+`'listening'` event.  See also [`net.Server.listen(path)`][].
 
 ### server.listen(port[, hostname][, backlog][, callback])
 
 Begin accepting connections on the specified `port` and `hostname`. If the
 `hostname` is omitted, the server will accept connections on any IPv6 address
 (`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. Use a
-port value of zero to have the operating system assign an available port.
+port value of `0` to have the operating system assign an available port.
 
 To listen to a unix socket, supply a filename instead of port and hostname.
 
@@ -542,8 +549,8 @@ The actual length will be determined by your OS through sysctl settings such as
 `tcp_max_syn_backlog` and `somaxconn` on linux. The default value of this
 parameter is 511 (not 512).
 
-This function is asynchronous. The last parameter `callback` will be added as
-a listener for the `'listening'` event.  See also [`net.Server.listen(port)`][].
+This function is asynchronous. `callback` will be added as a listener for the
+`'listening'` event.  See also [`net.Server.listen(port)`][].
 
 ### server.maxHeadersCount
 
@@ -776,8 +783,8 @@ be called multiple times to provide successive parts of the body.
 
 `chunk` can be a string or a buffer. If `chunk` is a string,
 the second parameter specifies how to encode it into a byte stream.
-By default the `encoding` is `'utf8'`. The last parameter `callback`
-will be called when this chunk of data is flushed.
+By default the `encoding` is `'utf8'`. `callback` will be called when this chunk
+of data is flushed.
 
 **Note**: This is the raw HTTP body and has nothing to do with
 higher-level multi-part body encodings that may be used.
@@ -853,6 +860,13 @@ headers and data.
 It implements the [Readable Stream][] interface, as well as the
 following additional events, methods, and properties.
 
+### Event: 'aborted'
+
+`function () { }`
+
+Emitted when the request has been aborted by the client and the network
+socket has closed.
+
 ### Event: 'close'
 
 `function () { }`
@@ -996,7 +1010,7 @@ $ node
 }
 ```
 
-If you would like to extract the params from the query string,
+If you would like to extract the parameters from the query string,
 you can use the `require('querystring').parse` function, or pass
 `true` as the second argument to `require('url').parse`.  Example:
 

doc/api/process.md

@@ -123,7 +123,7 @@ code without properly recovering from the exception can cause additional
 unforeseen and unpredictable issues.
 
 Exceptions thrown from within the event handler will not be caught. Instead the
-process will exit with a non zero exit code and the stack trace will be printed.
+process will exit with a non-zero exit code and the stack trace will be printed.
 This is to avoid infinite recursion.
 
 Attempting to resume normally after an uncaught exception can be similar to