Release proposal: v3.2.0

.eslintrc

@@ -66,6 +66,8 @@ rules:
   eol-last: 2
   ## no trailing spaces
   no-trailing-spaces: 2
+  # require space after keywords, eg 'for (..)'
+  space-after-keywords: 2
 
   # Strict Mode
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode

.mailmap

@@ -77,6 +77,7 @@ Maciej Małecki <[email protected]> <[email protected]>
 Malte-Thorben Bruns <[email protected]>
 Malte-Thorben Bruns <[email protected]>
 Mathias Pettersson <[email protected]>
+Matthew Lye <[email protected]>
 Michael Bernstein <[email protected]>
 Michael Wilber <[email protected]>
 Micheil Smith <[email protected]> <[email protected]>
@@ -112,7 +113,8 @@ Siddharth Mahendraker <[email protected]> <[email protected]>
 Simon Willison <[email protected]>
 Stanislav Opichal <[email protected]>
 Stefan Bühler <[email protected]>
-Steven R. Loomis <[email protected]>
+Steven R. Loomis <[email protected]> <[email protected]>
+Todd Kennedy <[email protected]> <[email protected]>
 TJ Holowaychuk <[email protected]>
 TJ Holowaychuk <[email protected]> <[email protected]>
 Tadashi SAWADA <[email protected]>

AUTHORS

@@ -631,6 +631,7 @@ dead-horse <[email protected]>
 Luis Reis <[email protected]>
 Jackson Tian <[email protected]>
 sudodoki <[email protected]>
+Steven Loomis <[email protected]>
 haoxin <[email protected]>
 Artur Cistov <[email protected]>
 MK Safi <[email protected]>
@@ -688,7 +689,7 @@ Roman Reiss <[email protected]>
 Glen Keane <[email protected]>
 Xiaowei Li <[email protected]>
 toastynerd <[email protected]>
-Todd Kennedy <[email protected]>
+Todd Kennedy <[email protected]>
 Icer Liang <[email protected]>
 Stephen Belanger <[email protected]>
 Jeremiah Senkpiel <[email protected]>
@@ -773,5 +774,17 @@ Pierre Inglebert <[email protected]>
 Ivan Yan <[email protected]>
 Sangmin Yoon <[email protected]>
 Mark Plomer <[email protected]>
+Phillip Johnsen <[email protected]>
+Matteo Collina <[email protected]>
+jomo <[email protected]>
+Gireesh Punathil <[email protected]>
+Lucien Greathouse <[email protected]>
+Chad Johnston <[email protected]>
+Sam Stites <[email protected]>
+Matthew Lye <[email protected]>
+Matt Loring <[email protected]>
+P.S.V.R <[email protected]>
+Jacob Edelman <[email protected]>
+Mike Atkins <[email protected]>
 
 # Generated by tools/update-authors.sh

Makefile

@@ -17,6 +17,11 @@ NODE ?= ./iojs$(EXEEXT)
 NODE_EXE = iojs$(EXEEXT)
 NODE_G_EXE = iojs_g$(EXEEXT)
 
+# Flags for packaging.
+BUILD_DOWNLOAD_FLAGS ?= --download=all
+BUILD_INTL_FLAGS ?= --with-intl=small-icu
+BUILD_RELEASE_FLAGS ?= $(BUILD_DOWNLOAD_FLAGS) $(BUILD_INTL_FLAGS)
+
 # Default to verbose builds.
 # To do quiet/pretty builds, run `make V=` to set V to an empty string,
 # or set the V environment variable to an empty string.
@@ -302,7 +307,7 @@ $(PKG): release-only
 		--dest-cpu=x64 \
 		--tag=$(TAG) \
 		--release-urlbase=$(RELEASE_URLBASE) \
-		$(CONFIG_FLAGS)
+		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
 	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
 	cat tools/osx-pkg.pmdoc/index.xml.tmpl \
@@ -363,7 +368,7 @@ $(TARBALL)-headers: config.gypi release-only
 		--dest-cpu=$(DESTCPU) \
 		--tag=$(TAG) \
 		--release-urlbase=$(RELEASE_URLBASE) \
-		$(CONFIG_FLAGS)
+		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '/'
 	find $(TARNAME)/ -type l | xargs rm # annoying on windows
 	tar -cf $(TARNAME)-headers.tar $(TARNAME)
@@ -393,7 +398,7 @@ $(BINARYTAR): release-only
 		--dest-cpu=$(DESTCPU) \
 		--tag=$(TAG) \
 		--release-urlbase=$(RELEASE_URLBASE) \
-		$(CONFIG_FLAGS)
+		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
@@ -478,8 +483,19 @@ CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
 CPPLINT_EXCLUDE += src/queue.h
 CPPLINT_EXCLUDE += src/tree.h
 CPPLINT_EXCLUDE += src/v8abbr.h
-
-CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard src/*.cc src/*.h src/*.c tools/icu/*.h tools/icu/*.cc deps/debugger-agent/include/* deps/debugger-agent/src/*))
+CPPLINT_EXCLUDE += $(wildcard test/addons/doc-*/*.cc test/addons/doc-*/*.h)
+
+CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \
+	deps/debugger-agent/include/* \
+	deps/debugger-agent/src/* \
+	src/*.c \
+	src/*.cc \
+	src/*.h \
+	test/addons/*/*.cc \
+	test/addons/*/*.h \
+	tools/icu/*.cc \
+	tools/icu/*.h \
+	))
 
 cpplint:
 	@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)

README.md

@@ -269,20 +269,46 @@ NOTE: Windows is not yet supported
 It is possible to build io.js with
 [OpenSSL FIPS module](https://www.openssl.org/docs/fips/fipsnotes.html).
 
+**Note** that building in this way does **not** allow you to
+claim that the runtime is FIPS 140-2 validated.  Instead you
+can indicate that the runtime uses a validated module.  See
+the [security policy]
+(http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf)
+page 60 for more details.  In addition, the validation for
+the underlying module is only valid if it is deployed in
+accordance with its [security policy]
+(http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf).
+If you need FIPS validated cryptography it is recommended that you
+read both the [security policy]
+(http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf)
+and [user guide] (https://openssl.org/docs/fips/UserGuide-2.0.pdf).
+
 Instructions:
 
-1. Download and verify `openssl-fips-x.x.x.tar.gz` from
-   https://www.openssl.org/source/
-2. Extract source to `openssl-fips` folder
-3. ``cd openssl-fips && ./config fipscanisterbuild --prefix=`pwd`/out``
-   (NOTE: On OS X, you may want to run
-    ``./Configure darwin64-x86_64-cc --prefix=`pwd`/out`` if you are going to
-    build x64-mode io.js)
-4. `make -j && make install`
-5. Get into io.js checkout folder
-6. `./configure --openssl-fips=/path/to/openssl-fips/out`
-7. Build io.js with `make -j`
-8. Verify with `node -p "process.versions.openssl"` (`1.0.2a-fips`)
+1. Obtain a copy of openssl-fips-x.x.x.tar.gz.
+   To comply with the security policy you must ensure the path
+   through which you get the file complies with the requirements
+   for a "secure intallation" as described in section 6.6 in
+   the [user guide] (https://openssl.org/docs/fips/UserGuide-2.0.pdf).
+   For evaluation/experimentation you can simply download and verify
+   `openssl-fips-x.x.x.tar.gz` from https://www.openssl.org/source/
+2. Extract source to `openssl-fips` folder and `cd openssl-fips`
+3. `./config`
+4. `make`
+5. `make install`
+   (NOTE: to comply with the security policy you must use the exact
+   commands in steps 3-5 without any additional options as per
+   Appendix A in the [security policy]
+   (http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf).
+   The only exception is that `./config no-asm` can be
+   used in place of `./config` )
+6. Get into io.js checkout folder
+7. `./configure --openssl-fips=/path/to/openssl-fips/installdir`
+   For example on ubuntu 12 the installation directory was
+   /usr/local/ssl/fips-2.0
+8. Build io.js with `make -j`
+9. Verify with `node -p "process.versions.openssl"` (`1.0.2a-fips`)
+
 
 ## Resources for Newcomers
 

benchmark/events/ee-listener-count.js → benchmark/events/ee-listener-count-on-prototype.js

@@ -7,14 +7,13 @@ function main(conf) {
   var n = conf.n | 0;
 
   var ee = new EventEmitter();
-  var listenerCount = EventEmitter.listenerCount;
 
   for (var k = 0; k < 10; k += 1)
     ee.on('dummy', function() {});
 
   bench.start();
   for (var i = 0; i < n; i += 1) {
-    var r = listenerCount(ee, 'dummy');
+    var r = ee.listenerCount('dummy');
   }
   bench.end(n);
 }

configure

@@ -335,6 +335,9 @@ parser.add_option('--enable-static',
 
 (options, args) = parser.parse_args()
 
+# Expand ~ in the install prefix now, it gets written to multiple files.
+options.prefix = os.path.expanduser(options.prefix or '')
+
 # set up auto-download list
 auto_downloads = nodedownload.parse(options.download_list)
 
@@ -611,7 +614,7 @@ def configure_mips(o):
 def configure_node(o):
   if options.dest_os == 'android':
     o['variables']['OS'] = 'android'
-  o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
+  o['variables']['node_prefix'] = options.prefix
   o['variables']['node_install_npm'] = b(not options.without_npm)
   o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
@@ -778,24 +781,31 @@ def write(filename, data):
 
 do_not_edit = '# Do not edit. Generated by the configure script.\n'
 
-def glob_to_var(dir_base, dir_sub):
+def glob_to_var(dir_base, dir_sub, patch_dir):
   list = []
   dir_all = os.path.join(dir_base, dir_sub)
   files = os.walk(dir_all)
   for ent in files:
     (path, dirs, files) = ent
     for file in files:
       if file.endswith('.cpp') or file.endswith('.c') or file.endswith('.h'):
-        list.append('%s/%s' % (dir_sub, file))
+        # srcfile uses "slash" as dir separator as its output is consumed by gyp
+        srcfile = '%s/%s' % (dir_sub, file)
+        if patch_dir:
+          patchfile = '%s/%s/%s' % (dir_base, patch_dir, file)
+          if os.path.isfile(patchfile):
+            srcfile = '%s/%s' % (patch_dir, file)
+            print 'Using version-specific floating patch %s' % patchfile
+        list.append(srcfile)
     break
   return list
 
 def configure_intl(o):
   icus = [
     {
-      'url': 'http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.zip',
-      # from https://ssl.icu-project.org/files/icu4c/54.1/icu4c-src-54_1.md5:
-      'md5': '6b89d60e2f0e140898ae4d7f72323bca',
+      'url': 'http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.zip',
+      # from https://ssl.icu-project.org/files/icu4c/55.1/icu4c-src-55_1.md5:
+      'md5': '4cddf1e1d47622fdd9de2cd7bb5001fd',
     },
   ]
   def icu_download(path):
@@ -1008,7 +1018,7 @@ def configure_intl(o):
   for i in icu_src:
     var  = 'icu_src_%s' % i
     path = '../../deps/icu/source/%s' % icu_src[i]
-    icu_config['variables'][var] = glob_to_var('tools/icu', path)
+    icu_config['variables'][var] = glob_to_var('tools/icu', path, 'patches/%s/source/%s' % (icu_ver_major, icu_src[i]) )
   # write updated icu_config.gypi with a bunch of paths
   write(icu_config_name, do_not_edit +
         pprint.pformat(icu_config, indent=2) + '\n')

doc/api/buffer.markdown

@@ -43,7 +43,7 @@ Creating a typed array from a `Buffer` works with the following caveats:
 
 2. The buffer's memory is interpreted as an array, not a byte array.  That is,
    `new Uint32Array(new Buffer([1,2,3,4]))` creates a 4-element `Uint32Array`
-   with elements `[1,2,3,4]`, not an `Uint32Array` with a single element
+   with elements `[1,2,3,4]`, not a `Uint32Array` with a single element
    `[0x1020304]` or `[0x4030201]`.
 
 NOTE: Node.js v0.8 simply retained a reference to the buffer in `array.buffer`
@@ -67,6 +67,10 @@ Allocates a new buffer of `size` bytes.  `size` must be less than
 2,147,483,648 bytes (2 GB) on 64 bits architectures,
 otherwise a `RangeError` is thrown.
 
+Unlike `ArrayBuffers`, the underlying memory for buffers is not initialized. So
+the contents of a newly created `Buffer` is unknown. Use `buf.fill(0)`to
+initialize a buffer to zeroes.
+
 ### new Buffer(array)
 
 * `array` Array

doc/api/child_process.markdown

@@ -279,7 +279,7 @@ Here is an example of sending a server:
       child.send('server', server);
     });
 
-And the child would the receive the server object as:
+And the child would then receive the server object as:
 
     process.on('message', function(m, server) {
       if (m === 'server') {

doc/api/cluster.markdown

@@ -121,7 +121,7 @@ values are `"rr"` and `"none"`.
 ## cluster.settings
 
 * {Object}
-  * `execArgv` {Array} list of string arguments passed to the io.js executable. 
+  * `execArgv` {Array} list of string arguments passed to the io.js executable.
     (Default=`process.execArgv`)
   * `exec` {String} file path to worker file.  (Default=`process.argv[1]`)
   * `args` {Array} string arguments passed to worker.
@@ -613,7 +613,7 @@ It is not emitted in the worker.
 
 ### Event: 'disconnect'
 
-Similar to the `cluster.on('disconnect')` event, but specfic to this worker.
+Similar to the `cluster.on('disconnect')` event, but specific to this worker.
 
     cluster.fork().on('disconnect', function() {
       // Worker has disconnected

doc/api/dns.markdown

@@ -85,7 +85,7 @@ All properties are optional. An example usage of options is shown below.
 ```
 
 The callback has arguments `(err, address, family)`. `address` is a string
-representation of a IP v4 or v6 address. `family` is either the integer 4 or 6
+representation of an IP v4 or v6 address. `family` is either the integer 4 or 6
 and denotes the family of `address` (not necessarily the value initially passed
 to `lookup`).
 
@@ -163,7 +163,7 @@ attribute (e.g. `[{'priority': 10, 'exchange': 'mx.example.com'},...]`).
 ## dns.resolveTxt(hostname, callback)
 
 The same as `dns.resolve()`, but only for text queries (`TXT` records).
-`addresses` is an 2-d array of the text records available for `hostname` (e.g.,
+`addresses` is a 2-d array of the text records available for `hostname` (e.g.,
 `[ ['v=spf1 ip4:0.0.0.0 ', '~all' ] ]`). Each sub-array contains TXT chunks of
 one record. Depending on the use case, the could be either joined together or
 treated separately.

doc/api/events.markdown

@@ -122,7 +122,7 @@ Note that `emitter.setMaxListeners(n)` still has precedence over
 
 ### emitter.listeners(event)
 
-Returns an array of listeners for the specified event.
+Returns a copy of the array of listeners for the specified event.
 
     server.on('connection', function (stream) {
       console.log('someone connected!');
@@ -137,10 +137,17 @@ Execute each of the listeners in order with the supplied arguments.
 Returns `true` if event had listeners, `false` otherwise.
 
 
+### emitter.listenerCount(type)
+
+* `type` {Value} The type of event
+
+Returns the number of listeners listening to the `type` of event.
+
 ### Class Method: EventEmitter.listenerCount(emitter, event)
 
 Return the number of listeners for a given event.
 
+_Note: This is deprecated. Use `emitter.listenerCount` instead._
 
 ### Event: 'newListener'