Merge branch 'nodejs/master' into chakracore-master

Sync to nodejs/master (2016-04-04) at
ae2be27

PR-URL: #52
Reviewed-By: Sandeep Agarwal <[email protected]>

.gitignore

@@ -51,6 +51,7 @@ ipch/
 /dist-osx
 /npm.wxs
 /tools/msvs/npm.wixobj
+/tools/msvs/genfiles/
 /tools/osx-pkg.pmdoc/index.xml
 /test/addons/??_*/
 email.md

GOVERNANCE.md

@@ -63,10 +63,9 @@ A guide for Collaborators is maintained in
 
 ## CTC Membership
 
-CTC seats are not time-limited.  There is no fixed size of the CTC.
-However, the expected target is between 6 and 12, to ensure adequate
-coverage of important areas of expertise, balanced with the ability to
-make decisions efficiently.
+CTC seats are not time-limited. There is no fixed size of the CTC. The CTC
+should be of such a size as to ensure adequate coverage of important areas of
+expertise balanced with the ability to make decisions efficiently.
 
 There is no specific set of requirements or qualifications for CTC
 membership beyond these rules.

Makefile

@@ -340,12 +340,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.
@@ -584,6 +592,8 @@ bench-all: bench bench-misc bench-array bench-buffer bench-url bench-events benc
 
 bench: bench-net bench-http bench-fs bench-tls
 
+bench-ci: bench
+
 bench-http-simple:
 	benchmark/http_simple_bench.sh
 
@@ -630,10 +640,12 @@ lint:
 		"$ git clone https://github.com/nodejs/node.git"
 endif
 
+lint-ci: lint
+
 .PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
 	check uninstall install install-includes install-bin all staticlib \
 	dynamiclib test test-all test-addons build-addons website-upload pkg \
 	blog blogclean tar binary release-only bench-http-simple bench-idle \
 	bench-all bench bench-misc bench-array bench-buffer bench-net \
 	bench-http bench-fs bench-tls cctest run-ci test-v8 test-v8-intl \
-	test-v8-benchmarks test-v8-all v8
+	test-v8-benchmarks test-v8-all v8 lint-ci bench-ci

WORKING_GROUPS.md

@@ -300,6 +300,11 @@ It's responsibilities are:
 * Working with the Build Working Group to improve continuous integration.
 * Improving tooling for testing.
 
+## Joining a WG
+
+To find out how to join a working group, consult the GOVERNANCE.md in
+the working group's repository, or simply open an issue there.
+
 ## Starting a WG
 
 A Working Group is established by first defining a charter  that can be

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 = Buffer.alloc(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++) {
-    Buffer.from(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

@@ -16,6 +16,8 @@
     'node_tag%': '',
     'uv_library%': 'static_library',
 
+    'openssl_fips%': '',
+
     # Default to -O0 for debug builds.
     'v8_optimized_debug%': 0,
 
@@ -300,6 +302,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')
@@ -616,14 +616,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
 
@@ -855,21 +858,6 @@ def configure_static(o):
         o['libraries'] += ['-static-libasan']
 
 
-def configure_winsdk(o):
-  if flavor != 'win':
-    return
-
-  winsdk_dir = os.environ.get('WindowsSdkDir')
-
-  if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'):
-    print('Found ctrpp in WinSDK--will build generated files '
-          'into tools/msvs/genfiles.')
-    o['variables']['node_has_winsdk'] = 'true'
-    return
-
-  print('ctrpp not found in WinSDK path--using pre-gen files '
-        'from tools/msvs/genfiles.')
-
 def write(filename, data):
   filename = os.path.join(root_dir, filename)
   print 'creating ', filename
@@ -1151,7 +1139,6 @@ configure_library('http_parser', output)
 configure_library('libuv', output)
 configure_v8(output)
 configure_openssl(output)
-configure_winsdk(output)
 configure_intl(output)
 configure_static(output)
 configure_engine(output)

deps/npm/.mailmap

@@ -23,6 +23,7 @@ Forbes Lindesay <[email protected]>
 Forrest L Norvell <[email protected]> <[email protected]>
 Gabriel Barros <[email protected]>
 Geoff Flarity <[email protected]> <gflarity@raptvm-x02.(none)>
+Ifeanyi Oraelosi <[email protected]>
 Isaac Z. Schlueter <[email protected]> <[email protected]>
 Isaac Z. Schlueter <[email protected]> isaacs <[email protected]>
 Jake Verbaten <[email protected]>
@@ -59,3 +60,4 @@ Will Elwood <[email protected]>
 Wout Mertens <[email protected]>
 Yeonghoon Park <[email protected]>
 Zeke Sikelianos <[email protected]>
+Zoujie Wzj <[email protected]>

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 <[email protected]>
 Xcat Liu <[email protected]>
 harryh <[email protected]>
 Prayag Verma <[email protected]>
+Neil Kistner <[email protected]>
+Zoujie Wzj <[email protected]>
+Ryan Hendrickson <[email protected]>
+Arturo Coronel <[email protected]>
+Hutson Betts <[email protected]>
+Lewis Cowper <[email protected]>
+Adam Byrne <[email protected]>
+Ifeanyi Oraelosi <[email protected]>
+Robert Ludwig <[email protected]>
+Chris Warren <[email protected]>
+Scott Plumlee <[email protected]>
+Daniel Pedersen <[email protected]>
+rhgb <[email protected]>
+doug.wade <[email protected]>
+Zac <[email protected]>
+GriffinSchneider <[email protected]>
+Andres Kalle <[email protected]>
+thefourtheye <[email protected]>