Merge v3.1.0 into next+1

.eslintrc

@@ -10,6 +10,8 @@ ecmaFeatures:
   generators: true
   forOf: true
   objectLiteralShorthandProperties: true
+  objectLiteralShorthandMethods: true
+  classes: true
 
 rules:
   # Possible Errors
@@ -43,8 +45,7 @@ rules:
   ## 2 space indentation
   indent: [2, 2]
   ## add space after comma
-  ## set to 'warn' because of https://github.com/eslint/eslint/issues/2408
-  comma-spacing: 1
+  comma-spacing: 2
   ## put semi-colon
   semi: 2
   ## require spaces operator like var sum = 1 + 1;

.mailmap

@@ -52,6 +52,7 @@ Igor Zinkovsky <igorzi@microsoft.com>
 Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Jake Verbaten <raynos2@gmail.com>
+James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 Jered Schmidt <tr@nslator.jp>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>

AUTHORS

@@ -260,7 +260,7 @@ Adam Malcontenti-Wilson <adman.com@gmail.com>
 Avi Flax <avi@aviflax.com>
 Pedro Teixeira <pedro.teixeira@gmail.com>
 Johan Bergström <bugs@bergstroem.nu>
-James Hartig <james.hartig@grooveshark.com>
+James Hartig <fastest963@gmail.com>
 Shannen Saez <shannenlaptop@gmail.com>
 Seong-Rak Choi <ragiragi@hanmail.net>
 Dave Irvine <davman99@gmail.com>
@@ -764,5 +764,14 @@ Frederic Hemberger <mail@frederic-hemberger.de>
 Sharat M R <cosmosgenius@gmail.com>
 Rich Trott <rtrott@gmail.com>
 Felipe Batista <fsbatista1@gmail.com>
+Rebecca Turner <me@re-becca.org>
+Tyler Anton <mtyleranton@gmail.com>
+João Reis <reis@janeasystems.com>
+Kat Marchán <kzm@sykosomatic.org>
+Ryan Petschek <petschekr@gmail.com>
+Pierre Inglebert <pierre.inglebert@gmail.com>
+Ivan Yan <yan.2314@gmail.com>
+Sangmin Yoon <sangmin.yoon@croquis.com>
+Mark Plomer <mark.plomer@boerse-go.de>
 
 # Generated by tools/update-authors.sh

CONTRIBUTING.md

@@ -126,7 +126,7 @@ test/parallel/ directory.  Look at other tests to see how they should be
 structured (license boilerplate, common includes, etc.).
 
 ```text
-$ make jslint test
+$ ./configure && make -j8 test
 ```
 
 Make sure the linter is happy and that all tests pass.  Please, do not submit
@@ -142,9 +142,11 @@ $ python tools/test.py -v --mode=release parallel/test-stream2-transform
 You can run tests directly with iojs:
 
 ```text
-$ iojs ./test/parallel/test-streams2-transform.js
+$ ./iojs ./test/parallel/test-stream2-transform.js
 ```
 
+Remember to recompile with `make -j8` in between test runs if you change
+core modules.
 
 ### Step 6: Push
 

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.
@@ -139,7 +144,7 @@ test-debugger: all
 	$(PYTHON) tools/test.py debugger
 
 test-npm: $(NODE_EXE)
-	NODE_EXE=$(NODE_EXE) tools/test-npm.sh
+	NODE=$(NODE) tools/test-npm.sh
 
 test-npm-publish: $(NODE_EXE)
 	npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js
@@ -156,7 +161,7 @@ test-timers-clean:
 
 apidoc_sources = $(wildcard doc/api/*.markdown)
 apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) \
-          $(addprefix out/,$(apidoc_sources:.markdown=.json))
+		$(addprefix out/,$(apidoc_sources:.markdown=.json))
 
 apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets
 
@@ -185,6 +190,11 @@ docopen: out/doc/api/all.html
 docclean:
 	-rm -rf out/doc
 
+run-ci:
+	$(PYTHON) ./configure $(CONFIG_FLAGS)
+	$(MAKE)
+	$(MAKE) test-ci
+
 RAWVER=$(shell $(PYTHON) tools/getnodeversion.py)
 VERSION=v$(RAWVER)
 
@@ -237,9 +247,17 @@ else
 ifeq ($(DESTCPU),arm)
 ARCH=arm
 else
+ifeq ($(DESTCPU),ppc64)
+ARCH=ppc64
+else
+ifeq ($(DESTCPU),ppc)
+ARCH=ppc
+else
 ARCH=x86
 endif
 endif
+endif
+endif
 
 # enforce "x86" over "ia32" as the generally accepted way of referring to 32-bit intel
 ifeq ($(ARCH),ia32)
@@ -264,7 +282,7 @@ release-only:
 	@if [ "$(shell git status --porcelain | egrep -v '^\?\? ')" = "" ]; then \
 		exit 0 ; \
 	else \
-	  echo "" >&2 ; \
+		echo "" >&2 ; \
 		echo "The git repository is not clean." >&2 ; \
 		echo "Please commit changes before building release tarball." >&2 ; \
 		echo "" >&2 ; \
@@ -275,17 +293,21 @@ release-only:
 	@if [ "$(DISTTYPE)" != "release" -o "$(RELEASE)" = "1" ]; then \
 		exit 0; \
 	else \
-	  echo "" >&2 ; \
+		echo "" >&2 ; \
 		echo "#NODE_VERSION_IS_RELEASE is set to $(RELEASE)." >&2 ; \
-	  echo "Did you remember to update src/node_version.h?" >&2 ; \
-	  echo "" >&2 ; \
+		echo "Did you remember to update src/node_version.h?" >&2 ; \
+		echo "" >&2 ; \
 		exit 1 ; \
 	fi
 
 $(PKG): release-only
 	rm -rf $(PKGDIR)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --dest-cpu=x64 --tag=$(TAG)
+	$(PYTHON) ./configure \
+		--dest-cpu=x64 \
+		--tag=$(TAG) \
+		--release-urlbase=$(RELEASE_URLBASE) \
+		$(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 \
@@ -341,8 +363,13 @@ doc-upload: tar
 	ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/doc.done"
 
 $(TARBALL)-headers: config.gypi release-only
-	$(PYTHON) ./configure --prefix=/ --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
-	HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(TARNAME)' '$(PREFIX)'
+	$(PYTHON) ./configure \
+		--prefix=/ \
+		--dest-cpu=$(DESTCPU) \
+		--tag=$(TAG) \
+		--release-urlbase=$(RELEASE_URLBASE) \
+		$(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)
 	rm -rf $(TARNAME)
@@ -366,7 +393,12 @@ endif
 $(BINARYTAR): release-only
 	rm -rf $(BINARYNAME)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --prefix=/ --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
+	$(PYTHON) ./configure \
+		--prefix=/ \
+		--dest-cpu=$(DESTCPU) \
+		--tag=$(TAG) \
+		--release-urlbase=$(RELEASE_URLBASE) \
+		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
@@ -433,7 +465,7 @@ bench-all: bench bench-misc bench-array bench-buffer bench-url bench-events
 bench: bench-net bench-http bench-fs bench-tls
 
 bench-http-simple:
-	 benchmark/http_simple_bench.sh
+	benchmark/http_simple_bench.sh
 
 bench-idle:
 	$(NODE) benchmark/idle_server.js &
@@ -451,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)
@@ -464,4 +507,4 @@ lint: jslint cpplint
 	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
+	bench-http bench-fs bench-tls cctest run-ci

README.md

@@ -119,6 +119,12 @@ To read the documentation:
 $ man doc/iojs.1
 ```
 
+To test if io.js was built correctly:
+
+```
+$ iojs -e "console.log('Hello from io.js ' + process.version)"
+```
+
 ### Windows
 
 Prerequisites:
@@ -140,6 +146,12 @@ To run the tests:
 > vcbuild test
 ```
 
+To test if io.js was built correctly:
+
+```
+$ iojs -e "console.log('Hello from io.js ' + process.version)"
+```
+
 ### Android / Android based devices, aka. Firefox OS
 
 Be sure you have downloaded and extracted [Android NDK]
@@ -257,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
 
@@ -294,35 +332,47 @@ handling your report.
 ## Current Project Team Members
 
 The io.js project team comprises a group of core collaborators and a sub-group
-that forms the _Technical Committee_ (TC) which governs the project. For more
+that forms the _Technical Steering Committee_ (TSC) which governs the project. For more
 information about the governance of the io.js project, see
 [GOVERNANCE.md](./GOVERNANCE.md).
 
-* **Isaac Z. Schlueter** <i@izs.me> ([@isaacs](https://github.com/isaacs)) (Technical Committee)
-* **Ben Noordhuis** <info@bnoordhuis.nl> ([@bnoordhuis](https://github.com/bnoordhuis)) (Technical Committee)
-* **Bert Belder** <bertbelder@gmail.com> ([@piscisaureus](https://github.com/piscisaureus)) (Technical Committee)
-* **Fedor Indutny** <fedor.indutny@gmail.com> ([@indutny](https://github.com/indutny)) (Technical Committee)
-* **Trevor Norris** <trev.norris@gmail.com> ([@trevnorris](https://github.com/trevnorris)) (Technical Committee)
-* **Chris Dickinson** <christopher.s.dickinson@gmail.com> ([@chrisdickinson](https://github.com/chrisdickinson)) (Technical Committee)
+=======
+### TSC (Technical Steering Committee)
+
+* **Ben Noordhuis** <info@bnoordhuis.nl> ([@bnoordhuis](https://github.com/bnoordhuis))
+* **Bert Belder** <bertbelder@gmail.com> ([@piscisaureus](https://github.com/piscisaureus))
+* **Fedor Indutny** <fedor.indutny@gmail.com> ([@indutny](https://github.com/indutny))
+* **Trevor Norris** <trev.norris@gmail.com> ([@trevnorris](https://github.com/trevnorris))
+* **Chris Dickinson** <christopher.s.dickinson@gmail.com> ([@chrisdickinson](https://github.com/chrisdickinson))
   - Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B
+* **Rod Vagg** <rod@vagg.org> ([@rvagg](https://github.com/rvagg))
+  - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D
+* **Jeremiah Senkpiel** <fishrock123@rocketmail.com> ([@fishrock123](https://github.com/fishrock123))
+  - Release GPG key: FD3A5288F042B6850C66B31F09FE44734EB7990E
 * **Colin Ihrig** <cjihrig@gmail.com> ([@cjihrig](https://github.com/cjihrig))
+  - Release GPG key: 94AE36675C464D64BAFA68DD7434390BDBE9B9C5
+* **Alexis Campailla** <orangemocha@nodejs.org> ([@orangemocha](https://github.com/orangemocha))
+* **Julien Gilli** <jgilli@nodejs.org> ([@misterdjules](https://github.com/misterdjules))
+* **James M Snell** <jasnell@gmail.com> ([@jasnell](https://github.com/jasnell))
+* **Steven R Loomis** <srloomis@us.ibm.com> ([@srl295](https://github.com/srl295))
+* **Michael Dawson** <michael_dawson@ca.ibm.com> ([@mhdawson](https://github.com/mhdawson))
+* **Shigeki Ohtsu** <ohtsu@iij.ad.jp> ([@shigeki](https://github.com/shigeki))
+* **Brian White** <mscdex@mscdex.net> ([@mscdex](https://github.com/mscdex))
+
+### Collaborators
+
+* **Isaac Z. Schlueter** <i@izs.me> ([@isaacs](https://github.com/isaacs))
 * **Mikeal Rogers** <mikeal.rogers@gmail.com> ([@mikeal](https://github.com/mikeal))
-* **Rod Vagg** <rod@vagg.org> ([@rvagg](https://github.com/rvagg)) (Technical Committee)
-  - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 * **Thorsten Lorenz** <thlorenz@gmx.de> ([@thlorenz](https://github.com/thlorenz))
 * **Stephen Belanger** <admin@stephenbelanger.com> ([@qard](https://github.com/qard))
-* **Jeremiah Senkpiel** <fishrock123@rocketmail.com> ([@fishrock123](https://github.com/fishrock123)) (Technical Committee)
-  - Release GPG key: FD3A5288F042B6850C66B31F09FE44734EB7990E
 * **Evan Lucas** <evanlucas@me.com> ([@evanlucas](https://github.com/evanlucas))
 * **Brendan Ashworth** <brendan.ashworth@me.com> ([@brendanashworth](https://github.com/brendanashworth))
 * **Vladimir Kurchatkin** <vladimir.kurchatkin@gmail.com> ([@vkurchatkin](https://github.com/vkurchatkin))
 * **Nikolai Vavilov** <vvnicholas@gmail.com> ([@seishun](https://github.com/seishun))
 * **Nicu Micleușanu** <micnic90@gmail.com> ([@micnic](https://github.com/micnic))
 * **Aleksey Smolenchuk** <lxe@lxe.co> ([@lxe](https://github.com/lxe))
-* **Shigeki Ohtsu** <ohtsu@iij.ad.jp> ([@shigeki](https://github.com/shigeki))
 * **Sam Roberts** <vieuxtech@gmail.com> ([@sam-github](https://github.com/sam-github))
 * **Wyatt Preul** <wpreul@gmail.com> ([@geek](https://github.com/geek))
-* **Brian White** <mscdex@mscdex.net> ([@mscdex](https://github.com/mscdex))
 * **Christian Tellnes** <christian@tellnes.no> ([@tellnes](https://github.com/tellnes))
 * **Robert Kowalski** <rok@kowalski.gd> ([@robertkowalski](https://github.com/robertkowalski))
 * **Julian Duque** <julianduquej@gmail.com> ([@julianduque](https://github.com/julianduque))
@@ -337,6 +387,9 @@ information about the governance of the io.js project, see
 * **Domenic Denicola** <d@domenic.me> ([@domenic](https://github.com/domenic))
 * **Rich Trott** <rtrott@gmail.com> ([@Trott](https://github.com/Trott))
 * **Сковорода Никита Андреевич** <chalkerx@gmail.com> ([@ChALkeR](https://github.com/ChALkeR))
+* **Sakthipriyan Vairamani** <thechargingvolcano@gmail.com> ([@thefourtheye](https://github.com/thefourtheye))
+* **Michaël Zasso** <mic.besace@gmail.com> ([@targos](https://github.com/targos))
+* **João Reis** <reis@janeasystems.com> ([@joaocgreis](https://github.com/joaocgreis))
 
-Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
+Collaborators & TSC members follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
 maintaining the io.js project.