Merge nodejs/master

Merge a80b162 as of 2017-08-30. This is an automatically created merge. For any problems please contact @kunalspathak.
nodejs · Sep 7, 2017 · 154a03e · 154a03e
2 parents 58217d2 + a80b162
commit 154a03e
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 19 deletions.
diff --git a/doc/api/http.md b/doc/api/http.md
@@ -1695,8 +1695,8 @@ changes:
 Since most requests are GET requests without bodies, Node.js provides this
 convenience method. The only difference between this method and
 [`http.request()`][] is that it sets the method to GET and calls `req.end()`
-automatically. Note that response data must be consumed in the callback
-for reasons stated in [`http.ClientRequest`][] section.
+automatically. Note that the callback must take care to consume the response
+data for reasons stated in [`http.ClientRequest`][] section.
 
 The `callback` is invoked with a single argument that is an instance of
 [`http.IncomingMessage`][]

diff --git a/doc/api/http2.md b/doc/api/http2.md
@@ -757,7 +757,7 @@ added: v8.4.0
 
 Shortcut for `http2stream.rstStream()` using error code `0x00` (No Error).
 
-#### http2stream.rstWithProtocolError() {
+#### http2stream.rstWithProtocolError()
 <!-- YAML
 added: v8.4.0
 -->
@@ -766,7 +766,7 @@ added: v8.4.0
 
 Shortcut for `http2stream.rstStream()` using error code `0x01` (Protocol Error).
 
-#### http2stream.rstWithCancel() {
+#### http2stream.rstWithCancel()
 <!-- YAML
 added: v8.4.0
 -->
@@ -775,7 +775,7 @@ added: v8.4.0
 
 Shortcut for `http2stream.rstStream()` using error code `0x08` (Cancel).
 
-#### http2stream.rstWithRefuse() {
+#### http2stream.rstWithRefuse()
 <!-- YAML
 added: v8.4.0
 -->
@@ -784,7 +784,7 @@ added: v8.4.0
 
 Shortcut for `http2stream.rstStream()` using error code `0x07` (Refused Stream).
 
-#### http2stream.rstWithInternalError() {
+#### http2stream.rstWithInternalError()
 <!-- YAML
 added: v8.4.0
 -->

diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
@@ -384,7 +384,7 @@
     // Arrays containing hook flags and ids for async_hook calls.
     const { async_hook_fields, async_uid_fields } = async_wrap;
     // Internal functions needed to manipulate the stack.
-    const { clearIdStack, popAsyncIds } = async_wrap;
+    const { clearIdStack, asyncIdStackSize } = async_wrap;
     const { kAfter, kCurrentAsyncId, kInitTriggerId } = async_wrap.constants;
 
     process._fatalException = function(er) {
@@ -424,8 +424,7 @@
           do {
             NativeModule.require('async_hooks').emitAfter(
               async_uid_fields[kCurrentAsyncId]);
-          // popAsyncIds() returns true if there are more ids on the stack.
-          } while (popAsyncIds(async_uid_fields[kCurrentAsyncId]));
+          } while (asyncIdStackSize() > 0);
         // Or completely empty the id stack.
         } else {
           clearIdStack();

diff --git a/lib/path.js b/lib/path.js
@@ -35,6 +35,7 @@ function normalizeStringWin32(path, allowAboveRoot) {
   var lastSlash = -1;
   var dots = 0;
   var code;
+  var isAboveRoot = false;
   for (var i = 0; i <= path.length; ++i) {
     if (i < path.length)
       code = path.charCodeAt(i);
@@ -46,7 +47,7 @@ function normalizeStringWin32(path, allowAboveRoot) {
       if (lastSlash === i - 1 || dots === 1) {
         // NOOP
       } else if (lastSlash !== i - 1 && dots === 2) {
-        if (res.length < 2 ||
+        if (res.length < 2 || !isAboveRoot ||
             res.charCodeAt(res.length - 1) !== 46/*.*/ ||
             res.charCodeAt(res.length - 2) !== 46/*.*/) {
           if (res.length > 2) {
@@ -63,12 +64,14 @@ function normalizeStringWin32(path, allowAboveRoot) {
                 res = res.slice(0, j);
               lastSlash = i;
               dots = 0;
+              isAboveRoot = false;
               continue;
             }
           } else if (res.length === 2 || res.length === 1) {
             res = '';
             lastSlash = i;
             dots = 0;
+            isAboveRoot = false;
             continue;
           }
         }
@@ -77,12 +80,14 @@ function normalizeStringWin32(path, allowAboveRoot) {
             res += '\\..';
           else
             res = '..';
+          isAboveRoot = true;
         }
       } else {
         if (res.length > 0)
           res += '\\' + path.slice(lastSlash + 1, i);
         else
           res = path.slice(lastSlash + 1, i);
+        isAboveRoot = false;
       }
       lastSlash = i;
       dots = 0;
@@ -101,6 +106,7 @@ function normalizeStringPosix(path, allowAboveRoot) {
   var lastSlash = -1;
   var dots = 0;
   var code;
+  var isAboveRoot = false;
   for (var i = 0; i <= path.length; ++i) {
     if (i < path.length)
       code = path.charCodeAt(i);
@@ -112,7 +118,7 @@ function normalizeStringPosix(path, allowAboveRoot) {
       if (lastSlash === i - 1 || dots === 1) {
         // NOOP
       } else if (lastSlash !== i - 1 && dots === 2) {
-        if (res.length < 2 ||
+        if (res.length < 2 || !isAboveRoot ||
             res.charCodeAt(res.length - 1) !== 46/*.*/ ||
             res.charCodeAt(res.length - 2) !== 46/*.*/) {
           if (res.length > 2) {
@@ -129,12 +135,14 @@ function normalizeStringPosix(path, allowAboveRoot) {
                 res = res.slice(0, j);
               lastSlash = i;
               dots = 0;
+              isAboveRoot = false;
               continue;
             }
           } else if (res.length === 2 || res.length === 1) {
             res = '';
             lastSlash = i;
             dots = 0;
+            isAboveRoot = false;
             continue;
           }
         }
@@ -143,12 +151,14 @@ function normalizeStringPosix(path, allowAboveRoot) {
             res += '/..';
           else
             res = '..';
+          isAboveRoot = true;
         }
       } else {
         if (res.length > 0)
           res += '/' + path.slice(lastSlash + 1, i);
         else
           res = path.slice(lastSlash + 1, i);
+        isAboveRoot = false;
       }
       lastSlash = i;
       dots = 0;

diff --git a/src/async-wrap.cc b/src/async-wrap.cc
@@ -450,6 +450,13 @@ void AsyncWrap::PopAsyncIds(const FunctionCallbackInfo<Value>& args) {
 }
 
 
+void AsyncWrap::AsyncIdStackSize(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+  args.GetReturnValue().Set(
+      static_cast<double>(env->async_hooks()->stack_size()));
+}
+
+
 void AsyncWrap::ClearIdStack(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   env->async_hooks()->clear_id_stack();
@@ -486,6 +493,7 @@ void AsyncWrap::Initialize(Local<Object> target,
   env->SetMethod(target, "setupHooks", SetupHooks);
   env->SetMethod(target, "pushAsyncIds", PushAsyncIds);
   env->SetMethod(target, "popAsyncIds", PopAsyncIds);
+  env->SetMethod(target, "asyncIdStackSize", AsyncIdStackSize);
   env->SetMethod(target, "clearIdStack", ClearIdStack);
   env->SetMethod(target, "addIdToDestroyList", QueueDestroyId);
   env->SetMethod(target, "enablePromiseHook", EnablePromiseHook);

diff --git a/src/async-wrap.h b/src/async-wrap.h
@@ -110,6 +110,7 @@ class AsyncWrap : public BaseObject {
   static void GetAsyncId(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void PushAsyncIds(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void PopAsyncIds(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void AsyncIdStackSize(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void ClearIdStack(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void AsyncReset(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void QueueDestroyId(const v8::FunctionCallbackInfo<v8::Value>& args);

diff --git a/src/env-inl.h b/src/env-inl.h
@@ -179,6 +179,10 @@ inline bool Environment::AsyncHooks::pop_ids(double async_id) {
   return !ids_stack_.empty();
 }
 
+inline size_t Environment::AsyncHooks::stack_size() {
+  return ids_stack_.size();
+}
+
 inline void Environment::AsyncHooks::clear_id_stack() {
   while (!ids_stack_.empty())
     ids_stack_.pop();

diff --git a/src/env.h b/src/env.h
@@ -412,6 +412,7 @@ class Environment {
 
     inline void push_ids(double async_id, double trigger_id);
     inline bool pop_ids(double async_id);
+    inline size_t stack_size();
     inline void clear_id_stack();  // Used in fatal exceptions.
 
     // Used to propagate the trigger_id to the constructor of any newly created

diff --git a/test/async-hooks/test-graph.pipe.js b/test/async-hooks/test-graph.pipe.js
@@ -14,7 +14,7 @@ sleep
   .on('exit', common.mustCall(onsleepExit))
   .on('close', common.mustCall(onsleepClose));
 
-function onsleepExit(code) {}
+function onsleepExit() {}
 
 function onsleepClose() {}
 

diff --git a/test/parallel/test-emit-after-uncaught-exception.js b/test/parallel/test-emit-after-uncaught-exception.js
@@ -0,0 +1,40 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const async_hooks = require('async_hooks');
+
+const id_obj = {};
+let collect = true;
+
+const hook = async_hooks.createHook({
+  before(id) { if (collect) id_obj[id] = true; },
+  after(id) { delete id_obj[id]; },
+}).enable();
+
+process.once('uncaughtException', common.mustCall((er) => {
+  assert.strictEqual(er.message, 'bye');
+  collect = false;
+}));
+
+setImmediate(common.mustCall(() => {
+  process.nextTick(common.mustCall(() => {
+    assert.strictEqual(Object.keys(id_obj).length, 0);
+    hook.disable();
+  }));
+
+  // Create a stack of async ids that will need to be emitted in the case of
+  // an uncaught exception.
+  const ar1 = new async_hooks.AsyncResource('Mine');
+  ar1.emitBefore();
+
+  const ar2 = new async_hooks.AsyncResource('Mine');
+  ar2.emitBefore();
+
+  throw new Error('bye');
+
+  // TODO(trevnorris): This test shows that the after() hooks are always called
+  // correctly, but it doesn't solve where the emitDestroy() is missed because
+  // of the uncaught exception. Simple solution is to always call emitDestroy()
+  // before the emitAfter(), but how to codify this?
+}));
diff --git a/test/parallel/test-http2-compat-serverresponse-headers.js b/test/parallel/test-http2-compat-serverresponse-headers.js
@@ -42,13 +42,20 @@ server.listen(0, common.mustCall(function() {
     response.removeHeader(denormalised);
     assert.strictEqual(response.hasHeader(denormalised), false);
 
-    assert.throws(function() {
-      response.setHeader(':status', 'foobar');
-    }, common.expectsError({
-      code: 'ERR_HTTP2_PSEUDOHEADER_NOT_ALLOWED',
-      type: Error,
-      message: 'Cannot set HTTP/2 pseudo-headers'
-    }));
+    [
+      ':status',
+      ':method',
+      ':path',
+      ':authority',
+      ':scheme'
+    ].forEach((header) => assert.throws(
+      () => response.setHeader(header, 'foobar'),
+      common.expectsError({
+        code: 'ERR_HTTP2_PSEUDOHEADER_NOT_ALLOWED',
+        type: Error,
+        message: 'Cannot set HTTP/2 pseudo-headers'
+      })
+    ));
     assert.throws(function() {
       response.setHeader(real, null);
     }, common.expectsError({

diff --git a/test/parallel/test-path.js b/test/parallel/test-path.js
@@ -432,6 +432,11 @@ assert.strictEqual(path.win32.normalize('C:..\\..\\abc\\..\\def'),
                    'C:..\\..\\def');
 assert.strictEqual(path.win32.normalize('C:\\.'), 'C:\\');
 assert.strictEqual(path.win32.normalize('file:stream'), 'file:stream');
+assert.strictEqual(path.win32.normalize('bar\\foo..\\..\\'), 'bar\\');
+assert.strictEqual(path.win32.normalize('bar\\foo..\\..'), 'bar');
+assert.strictEqual(path.win32.normalize('bar\\foo..\\..\\baz'), 'bar\\baz');
+assert.strictEqual(path.win32.normalize('bar\\foo..\\'), 'bar\\foo..\\');
+assert.strictEqual(path.win32.normalize('bar\\foo..'), 'bar\\foo..');
 
 assert.strictEqual(path.posix.normalize('./fixtures///b/../b/c.js'),
                    'fixtures/b/c.js');
@@ -441,6 +446,11 @@ assert.strictEqual(path.posix.normalize('a//b//./c'), 'a/b/c');
 assert.strictEqual(path.posix.normalize('a//b//.'), 'a/b');
 assert.strictEqual(path.posix.normalize('/a/b/c/../../../x/y/z'), '/x/y/z');
 assert.strictEqual(path.posix.normalize('///..//./foo/.//bar'), '/foo/bar');
+assert.strictEqual(path.posix.normalize('bar/foo../../'), 'bar/');
+assert.strictEqual(path.posix.normalize('bar/foo../..'), 'bar');
+assert.strictEqual(path.posix.normalize('bar/foo../../baz'), 'bar/baz');
+assert.strictEqual(path.posix.normalize('bar/foo../'), 'bar/foo../');
+assert.strictEqual(path.posix.normalize('bar/foo..'), 'bar/foo..');
 
 
 // path.resolve tests

diff --git a/vcbuild.bat b/vcbuild.bat
@@ -323,6 +323,10 @@ copy /Y ..\deps\npm\bin\npm node-v%FULLVERSION%-win-%target_arch%\ > nul
 if errorlevel 1 echo Cannot copy npm && goto package_error
 copy /Y ..\deps\npm\bin\npm.cmd node-v%FULLVERSION%-win-%target_arch%\ > nul
 if errorlevel 1 echo Cannot copy npm.cmd && goto package_error
+copy /Y ..\deps\npm\bin\npx node-v%FULLVERSION%-win-%target_arch%\ > nul
+if errorlevel 1 echo Cannot copy npx && goto package_error
+copy /Y ..\deps\npm\bin\npx.cmd node-v%FULLVERSION%-win-%target_arch%\ > nul
+if errorlevel 1 echo Cannot copy npx.cmd && goto package_error
 copy /Y ..\tools\msvs\nodevars.bat node-v%FULLVERSION%-win-%target_arch%\ > nul
 if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error
 if not defined noetw (