src: Add missing using v8::MaybeLocal (v5.x)

Makefile

@@ -332,12 +332,20 @@ else
 ifeq ($(DESTCPU),ppc)
 ARCH=ppc
 else
+ifeq ($(DESTCPU),s390)
+ARCH=s390
+else
+ifeq ($(DESTCPU),s390x)
+ARCH=s390x
+else
 ARCH=x86
 endif
 endif
 endif
 endif
 endif
+endif
+endif
 
 # node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
 # pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.

android-configure

@@ -1,18 +1,49 @@
 #!/bin/bash
 
+if [ -z "$2" ]; then
+    ARCH=arm
+else
+    ARCH="$2"
+fi
+
+CC_VER="4.9"
+case $ARCH in
+    arm)
+        DEST_CPU="$ARCH"
+        SUFFIX="$ARCH-linux-androideabi"
+        TOOLCHAIN_NAME="$SUFFIX"
+        ;;
+    x86)
+        DEST_CPU="ia32"
+        SUFFIX="i686-linux-android"
+        TOOLCHAIN_NAME="$ARCH"
+        ;;
+    x86_64)
+        DEST_CPU="ia32"
+        SUFFIX="$ARCH-linux-android"
+        TOOLCHAIN_NAME="$ARCH"
+        ;;
+    *)
+        echo "Unsupported architecture provided: $ARCH"
+        exit 1
+        ;;
+esac
+
 export TOOLCHAIN=$PWD/android-toolchain
 mkdir -p $TOOLCHAIN
 $1/build/tools/make-standalone-toolchain.sh \
-    --toolchain=arm-linux-androideabi-4.9 \
-    --arch=arm \
+    --toolchain=$TOOLCHAIN_NAME-$CC_VER \
+    --arch=$ARCH \
     --install-dir=$TOOLCHAIN \
     --platform=android-21
 export PATH=$TOOLCHAIN/bin:$PATH
-export AR=$TOOLCHAIN/bin/arm-linux-androideabi-ar
-export CC=$TOOLCHAIN/bin/arm-linux-androideabi-gcc
-export CXX=$TOOLCHAIN/bin/arm-linux-androideabi-g++
-export LINK=$TOOLCHAIN/bin/arm-linux-androideabi-g++
+export AR=$TOOLCHAIN/bin/$SUFFIX-ar
+export CC=$TOOLCHAIN/bin/$SUFFIX-gcc
+export CXX=$TOOLCHAIN/bin/$SUFFIX-g++
+export LINK=$TOOLCHAIN/bin/$SUFFIX-g++
 
 ./configure \
-    --dest-cpu=arm \
-    --dest-os=android
+    --dest-cpu=$DEST_CPU \
+    --dest-os=android \
+    --without-snapshot \
+    --openssl-no-asm

benchmark/buffers/buffer_zero.js

@@ -3,16 +3,21 @@
 const common = require('../common.js');
 
 const bench = common.createBenchmark(main, {
-  n: [1024]
+  n: [1024],
+  type: ['buffer', 'string']
 });
 
-const zero = new Buffer(0);
+const zeroBuffer = Buffer.alloc(0);
+const zeroString = '';
 
 function main(conf) {
   var n = +conf.n;
   bench.start();
-  for (let i = 0; i < n * 1024; i++) {
-    new Buffer(zero);
-  }
+
+  if (conf.type === 'buffer')
+    for (let i = 0; i < n * 1024; i++) Buffer.from(zeroBuffer);
+  else if (conf.type === 'string')
+    for (let i = 0; i < n * 1024; i++) Buffer.from(zeroString);
+
   bench.end(n);
 }

benchmark/http/check_is_http_token.js

@@ -0,0 +1,52 @@
+'use strict';
+
+const common = require('../common.js');
+const _checkIsHttpToken = require('_http_common')._checkIsHttpToken;
+
+const bench = common.createBenchmark(main, {
+  key: [
+    'TCN',
+    'ETag',
+    'date',
+    'Vary',
+    'server',
+    'Server',
+    'status',
+    'version',
+    'Expires',
+    'alt-svc',
+    'location',
+    'Connection',
+    'Keep-Alive',
+    'content-type',
+    'Content-Type',
+    'Cache-Control',
+    'Last-Modified',
+    'Accept-Ranges',
+    'content-length',
+    'x-frame-options',
+    'x-xss-protection',
+    'Content-Encoding',
+    'Content-Location',
+    'Transfer-Encoding',
+    'alternate-protocol',
+    ':', // invalid input
+    '@@',
+    '中文呢', // unicode
+    '((((())))', // invalid
+    ':alternate-protocol', // fast bailout
+    'alternate-protocol:' // slow bailout
+  ],
+  n: [1e6],
+});
+
+function main(conf) {
+  var n = +conf.n;
+  var key = conf.key;
+
+  bench.start();
+  for (var i = 0; i < n; i++) {
+    _checkIsHttpToken(key);
+  }
+  bench.end(n);
+}

common.gypi

@@ -14,6 +14,8 @@
     'node_tag%': '',
     'uv_library%': 'static_library',
 
+    'openssl_fips%': '',
+
     # Default to -O0 for debug builds.
     'v8_optimized_debug%': 0,
 
@@ -68,6 +70,10 @@
             'cflags': [ '-gxcoff' ],
             'ldflags': [ '-Wl,-bbigtoc' ],
           }],
+          ['OS == "android"', {
+            'cflags': [ '-fPIE' ],
+            'ldflags': [ '-fPIE', '-pie' ]
+          }]
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ -101,6 +107,10 @@
           ['OS!="mac" and OS!="win"', {
             'cflags': [ '-fno-omit-frame-pointer' ],
           }],
+          ['OS == "android"', {
+            'cflags': [ '-fPIE' ],
+            'ldflags': [ '-fPIE', '-pie' ]
+          }]
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ -254,6 +264,14 @@
 	    'cflags': [ '-m64', '-mminimal-toc' ],
 	    'ldflags': [ '-m64' ],
 	   }],
+          [ 'target_arch=="s390"', {
+            'cflags': [ '-m31' ],
+            'ldflags': [ '-m31' ],
+          }],
+          [ 'target_arch=="s390x"', {
+            'cflags': [ '-m64' ],
+            'ldflags': [ '-m64' ],
+          }],
           [ 'OS=="solaris"', {
             'cflags': [ '-pthreads' ],
             'ldflags': [ '-pthreads' ],

configure

@@ -28,7 +28,7 @@ parser = optparse.OptionParser()
 valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
             'android', 'aix')
 valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 'x32',
-              'x64', 'x86')
+              'x64', 'x86', 's390', 's390x')
 valid_arm_float_abi = ('soft', 'softfp', 'hard')
 valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
 valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
@@ -601,14 +601,17 @@ def host_arch_cc():
     '__PPC64__'   : 'ppc64',
     '__PPC__'     : 'ppc',
     '__x86_64__'  : 'x64',
+    '__s390__'    : 's390',
+    '__s390x__'   : 's390x',
   }
 
   rtn = 'ia32' # default
 
   for i in matchup:
     if i in k and k[i] != '0':
       rtn = matchup[i]
-      break
+      if rtn != 's390':
+        break
 
   return rtn
 

deps/npm/.mailmap

@@ -23,6 +23,7 @@ Forbes Lindesay <forbes@lindesay.co.uk>
 Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
 Gabriel Barros <descartavel1@gmail.com>
 Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
+Ifeanyi Oraelosi <ifeanyioraelosi@gmail.com>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
 Jake Verbaten <raynos2@gmail.com>
@@ -59,3 +60,4 @@ Will Elwood <w.elwood08@gmail.com>
 Wout Mertens <Wout.Mertens@gmail.com>
 Yeonghoon Park <sola92@gmail.com>
 Zeke Sikelianos <zeke@sikelianos.com>
+Zoujie Wzj <zoujie.wzj@alibaba-inc.com>

deps/npm/.npmignore

@@ -7,6 +7,7 @@ npm-debug.log
 /test/packages/npm-test-depends-on-spark/which-spark.log
 /test/packages/test-package/random-data.txt
 /test/root
+/test/npm_cache
 node_modules/marked
 node_modules/ronn
 node_modules/tap

deps/npm/.travis.yml

@@ -13,6 +13,6 @@ before_install:
   - "node . install -g ."
   - "mkdir -p /var/run/couchdb"
 sudo: false
-script: "npm run-script test-all"
+script: "npm test"
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

deps/npm/AUTHORS

@@ -364,3 +364,21 @@ Jan Schär <jscissr@gmail.com>
 Xcat Liu <xcatliu@gmail.com>
 harryh <Aourin@users.noreply.github.com>
 Prayag Verma <prayag.verma@gmail.com>
+Neil Kistner <neil.kistner@gmail.com>
+Zoujie Wzj <zoujie.wzj@alibaba-inc.com>
+Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
+Arturo Coronel <aoitsu3@gmail.com>
+Hutson Betts <hbetts@factset.com>
+Lewis Cowper <lewis.cowper@googlemail.com>
+Adam Byrne <misterbyrne@gmail.com>
+Ifeanyi Oraelosi <ifeanyioraelosi@gmail.com>
+Robert Ludwig <rob.ludwig@rideamigos.com>
+Chris Warren <chris@ixalon.net>
+Scott Plumlee <scott@plumlee.org>
+Daniel Pedersen <daniel@scandinav.se>
+rhgb <kaiserdaemon@gmail.com>
+doug.wade <doug.wade@redfin.com>
+Zac <zdoege@gm.slc.edu>
+GriffinSchneider <griffinschneider@gmail.com>
+Andres Kalle <mjomble@gmail.com>
+thefourtheye <thefourtheye@users.noreply.github.com>