Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V4.3.1 proposal #5200

Merged
merged 64 commits into from
Feb 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
c41ed59
src: don't check failure with ERR_peek_error()
bnoordhuis Jan 17, 2016
667f7a7
debugger: guard against call from non-node context
bnoordhuis Dec 17, 2015
720b03d
tools: add license-builder.sh to construct LICENSE
rvagg Dec 3, 2015
36a4159
doc: rebuild LICENSE using tools/license-builder.sh
rvagg Dec 8, 2015
c96800a
tools: fix license-builder.sh for ICU
richardlau Jan 19, 2016
c0432e9
doc: restore ICU third-party software licenses
richardlau Jan 19, 2016
a2998a1
gitignore: never ignore debug module
targos Nov 5, 2015
2e0352d
tools: update eslint to v1.10.3
targos Jan 12, 2016
b20ea69
tools: update eslint config
targos Nov 5, 2015
15ed64e
lib: fix style issues after eslint update
targos Jan 12, 2016
066d5e7
tools: fix style issue after eslint update
targos Jan 13, 2016
607f545
test: fix style issues after eslint update
targos Jan 13, 2016
aefb20a
tls: copy client CAs and cert store on CertCb
indutny Oct 26, 2015
2e92a1a
module: move unnecessary work for early return
zertosh Oct 29, 2015
f213406
test: fix tls-multi-key race condition
santigimeno Nov 22, 2015
48c2783
doc: add docs working group
bengl Dec 11, 2015
f8a676e
cluster: fix race condition setting suicide prop
santigimeno Dec 18, 2015
75b0ea8
doc: add path property to Write/ReadStream in fs.markdown
claudiorodriguez Dec 20, 2015
305d340
test: test each block in addon.md contains js & cc
rvagg Dec 24, 2015
e6448aa
test: use addon.md block headings as test dir names
rvagg Dec 24, 2015
e2a682e
doc: fix formatting in process.markdown
Trott Dec 27, 2015
393e569
doc: copyedit setTimeout() documentation
Trott Dec 27, 2015
6809c2b
test: fix flaky child-process-fork-regr-gh-2847
mscdex Dec 27, 2015
a256790
test: fix flaky cluster-net-send
mscdex Dec 28, 2015
437d0e3
doc: mention that http.Server inherits from net.Server
ryansobol Dec 28, 2015
1bb2967
http: fix non-string header value concatenation
mscdex Dec 28, 2015
b8213ba
cluster: ignore queryServer msgs on disconnection
santigimeno Dec 29, 2015
ec24d37
test: fix flaky test-cluster-shared-leak
Trott Jan 1, 2016
3d5bc69
test: fix `http-upgrade-agent` flakiness
santigimeno Jan 3, 2016
26f0240
repl: make sure historyPath is trimmed
evanlucas Jan 5, 2016
8ed0c1c
net: fix dns lookup for android
daguej Jan 8, 2016
15fa555
net, doc: fix line wrapping lint in net.js
jasnell Jan 8, 2016
556703d
test: fix flaky unrefed timers test
Trott Jan 9, 2016
34d9e48
test: fix `http-upgrade-client` flakiness
santigimeno Jan 9, 2016
5990ba2
src: remove redeclarations of variables
Trott Jan 10, 2016
0e02eb0
test: only include http module once
Trott Jan 10, 2016
7afcdd3
test: require common module only once
Trott Jan 10, 2016
661b255
http: remove variable redeclaration
Trott Jan 10, 2016
6e829b4
dgram: prevent disabled optimization of bind()
mscdex Jan 10, 2016
8ea7660
test: move resource intensive tests to sequential
Trott Jan 11, 2016
909b516
test: remove 1 second delay from test
Trott Jan 11, 2016
d71f999
stream: remove useless if test in transform
zoubin Jan 11, 2016
7821b3e
tls_legacy: do not read on OpenSSL's stack
indutny Jan 6, 2016
583f334
debugger: remove variable redeclarations
Trott Jan 11, 2016
baa0a3d
test: fix race in test-net-server-pause-on-connect
Trott Jan 12, 2016
9ca24de
doc: add docs for more stream options
zoubin Jan 12, 2016
40c8e6d
net: remove hot path comment from connect
evanlucas Jan 12, 2016
d615757
test: fix flaky test-net-socket-local-address
cjihrig Jan 12, 2016
9d4a226
crypto: clear error stack in ECDH::Initialize
indutny Jan 14, 2016
4fbcb47
readline: Remove XXX and output debuglog
kohei-takata Jan 15, 2016
91066b5
doc: update branch-diff arguments in release doc
rvagg Jan 14, 2016
fb615bd
buffer: remove unnecessary TODO comments
pgeiss Jan 16, 2016
cb5986d
doc: add `servername` parameter docs
estliberitas Jan 17, 2016
0178001
test: make test-cluster-disconnect-leak reliable
Trott Jan 18, 2016
748d2b4
buffer: make byteLength work with Buffer correctly
JacksonTian Jan 18, 2016
be82745
test: improve test-cluster-disconnect-suicide-race
Trott Jan 18, 2016
39cb69c
doc: style fixes for the TOC
silverwind Jan 18, 2016
447347c
test: fix issues for space-in-parens ESLint rule
silverwind Jan 19, 2016
837ebd1
tools: enable space-in-parens ESLint rule
silverwind Jan 19, 2016
c3956d0
doc: update list of personal traits in CoC
zkat Jan 21, 2016
b66db49
tools: add support for subkeys in release tools
MylesBorins Jan 21, 2016
f205e99
test: fix tls-no-rsa-key flakiness
santigimeno Nov 26, 2015
1b070e4
node_contextify: do not incept debug context
Feb 1, 2016
ef37a46
2016-02-16, Version 4.3.1 'Argon' (LTS)
Feb 11, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lib/punycode.js
test/addons/doc-*/
test/addons/??_*/
test/fixtures
test/**/node_modules
test/disabled
Expand Down
10 changes: 4 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ rules:
no-duplicate-case: 2
## disallow assignment of exceptional params
no-ex-assign: 2
## disallow use of reserved words as keys like enum, class
no-reserved-keys: 2
## disallow unreachable code
no-unreachable: 2
## require valid typeof compared string like typeof foo === 'strnig'
Expand All @@ -44,7 +42,7 @@ rules:
## use single quote, we can use double quote when escape chars
quotes: [2, "single", "avoid-escape"]
## 2 space indentation
indent: [2, 2]
indent: [2, 2, {SwitchCase: 1}]
## add space after comma
comma-spacing: 2
## put semi-colon
Expand All @@ -67,8 +65,10 @@ rules:
eol-last: 2
## no trailing spaces
no-trailing-spaces: 2
# require space after keywords, eg 'for (..)'
## require space after keywords, eg 'for (..)'
space-after-keywords: 2
## no leading/trailing spaces in parens
space-in-parens: [2, "never"]

# ECMAScript 6
# list: http://eslint.org/docs/rules/#ecmascript-6
Expand Down Expand Up @@ -112,5 +112,3 @@ globals:
DTRACE_NET_SERVER_CONNECTION : false
LTTNG_NET_SERVER_CONNECTION : false
COUNTER_NET_SERVER_CONNECTION : false
escape : false
unescape : false
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ icu_config.gypi

# various stuff that VC++ produces/uses
Debug/
!node_modules/debug/
!**/node_modules/debug/
Release/
!doc/blog/**
*.sln
Expand All @@ -50,7 +50,7 @@ ipch/
/npm.wxs
/tools/msvs/npm.wixobj
/tools/osx-pkg.pmdoc/index.xml
/test/addons/doc-*/
/test/addons/??_*/
email.md
deps/v8-*
deps/icu
Expand Down
85 changes: 85 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,90 @@
# Node.js ChangeLog

## 2016-02-16, Version 4.3.1 'Argon' (LTS), @thealphanerd

### Notable changes

* **buffer**
* make byteLength work with Buffer correctly (Jackson Tian)
- [#4738](https://github.com/nodejs/node/pull/4738)
* **debugger**
* guard against call from non-node context (Ben Noordhuis)
- [#4328](https://github.com/nodejs/node/pull/4328)
- fixes segfaults in debugger
* do not incept debug context (Myles Borins)
- [#4819](https://github.com/nodejs/node/pull/4819)
- fixes crash in debugger when using util methods
* **deps**
* update to http-parser 2.5.2 (James Snell)
- [#5238](https://github.com/nodejs/node/pull/5238)

### Commits

* [[`748d2b4de1`](https://github.com/nodejs/node/commit/748d2b4de1)] - **buffer**: make byteLength work with Buffer correctly (Jackson Tian) [#4738](https://github.com/nodejs/node/pull/4738)
* [[`fb615bdaf4`](https://github.com/nodejs/node/commit/fb615bdaf4)] - **buffer**: remove unnecessary TODO comments (Peter Geiss) [#4719](https://github.com/nodejs/node/pull/4719)
* [[`b8213ba7e1`](https://github.com/nodejs/node/commit/b8213ba7e1)] - **cluster**: ignore queryServer msgs on disconnection (Santiago Gimeno) [#4465](https://github.com/nodejs/node/pull/4465)
* [[`f8a676ed59`](https://github.com/nodejs/node/commit/f8a676ed59)] - **cluster**: fix race condition setting suicide prop (Santiago Gimeno) [#4349](https://github.com/nodejs/node/pull/4349)
* [[`9d4a226dad`](https://github.com/nodejs/node/commit/9d4a226dad)] - **crypto**: clear error stack in ECDH::Initialize (Fedor Indutny) [#4689](https://github.com/nodejs/node/pull/4689)
* [[`583f3347d8`](https://github.com/nodejs/node/commit/583f3347d8)] - **debugger**: remove variable redeclarations (Rich Trott) [#4633](https://github.com/nodejs/node/pull/4633)
* [[`667f7a7ab3`](https://github.com/nodejs/node/commit/667f7a7ab3)] - **debugger**: guard against call from non-node context (Ben Noordhuis) [#4328](https://github.com/nodejs/node/pull/4328)
* [[`188cff3c31`](https://github.com/nodejs/node/commit/188cff3c31)] - **deps**: update to http-parser 2.5.2 (James Snell) [#5238](https://github.com/nodejs/node/pull/5238)
* [[`6e829b44e3`](https://github.com/nodejs/node/commit/6e829b44e3)] - **dgram**: prevent disabled optimization of bind() (Brian White) [#4613](https://github.com/nodejs/node/pull/4613)
* [[`c3956d05b1`](https://github.com/nodejs/node/commit/c3956d05b1)] - **doc**: update list of personal traits in CoC (Kat Marchán) [#4801](https://github.com/nodejs/node/pull/4801)
* [[`39cb69ca21`](https://github.com/nodejs/node/commit/39cb69ca21)] - **doc**: style fixes for the TOC (Roman Reiss) [#4748](https://github.com/nodejs/node/pull/4748)
* [[`cb5986da81`](https://github.com/nodejs/node/commit/cb5986da81)] - **doc**: add `servername` parameter docs (Alexander Makarenko) [#4729](https://github.com/nodejs/node/pull/4729)
* [[`91066b5f34`](https://github.com/nodejs/node/commit/91066b5f34)] - **doc**: update branch-diff arguments in release doc (Rod Vagg) [#4691](https://github.com/nodejs/node/pull/4691)
* [[`9ca24de41d`](https://github.com/nodejs/node/commit/9ca24de41d)] - **doc**: add docs for more stream options (zoubin) [#4639](https://github.com/nodejs/node/pull/4639)
* [[`437d0e336d`](https://github.com/nodejs/node/commit/437d0e336d)] - **doc**: mention that http.Server inherits from net.Server (Ryan Sobol) [#4455](https://github.com/nodejs/node/pull/4455)
* [[`393e569160`](https://github.com/nodejs/node/commit/393e569160)] - **doc**: copyedit setTimeout() documentation (Rich Trott) [#4434](https://github.com/nodejs/node/pull/4434)
* [[`e2a682ecc3`](https://github.com/nodejs/node/commit/e2a682ecc3)] - **doc**: fix formatting in process.markdown (Rich Trott) [#4433](https://github.com/nodejs/node/pull/4433)
* [[`75b0ea85bd`](https://github.com/nodejs/node/commit/75b0ea85bd)] - **doc**: add path property to Write/ReadStream in fs.markdown (Claudio Rodriguez) [#4368](https://github.com/nodejs/node/pull/4368)
* [[`48c2783421`](https://github.com/nodejs/node/commit/48c2783421)] - **doc**: add docs working group (Bryan English) [#4244](https://github.com/nodejs/node/pull/4244)
* [[`c0432e9f56`](https://github.com/nodejs/node/commit/c0432e9f56)] - **doc**: restore ICU third-party software licenses (Richard Lau) [#4762](https://github.com/nodejs/node/pull/4762)
* [[`36a4159dab`](https://github.com/nodejs/node/commit/36a4159dab)] - **doc**: rebuild LICENSE using tools/license-builder.sh (Rod Vagg) [#4194](https://github.com/nodejs/node/pull/4194)
* [[`a2998a1bce`](https://github.com/nodejs/node/commit/a2998a1bce)] - **gitignore**: never ignore debug module (Michaël Zasso) [#2286](https://github.com/nodejs/node/pull/2286)
* [[`661b2557d9`](https://github.com/nodejs/node/commit/661b2557d9)] - **http**: remove variable redeclaration (Rich Trott) [#4612](https://github.com/nodejs/node/pull/4612)
* [[`1bb2967d48`](https://github.com/nodejs/node/commit/1bb2967d48)] - **http**: fix non-string header value concatenation (Brian White) [#4460](https://github.com/nodejs/node/pull/4460)
* [[`15ed64e34c`](https://github.com/nodejs/node/commit/15ed64e34c)] - **lib**: fix style issues after eslint update (Michaël Zasso) [nodejs/io.js#2286](https://github.com/nodejs/io.js/pull/2286)
* [[`2e92a1a6b4`](https://github.com/nodejs/node/commit/2e92a1a6b4)] - **module**: move unnecessary work for early return (Andres Suarez) [#3579](https://github.com/nodejs/node/pull/3579)
* [[`40c8e6d75d`](https://github.com/nodejs/node/commit/40c8e6d75d)] - **net**: remove hot path comment from connect (Evan Lucas) [#4648](https://github.com/nodejs/node/pull/4648)
* [[`8ed0c1c22c`](https://github.com/nodejs/node/commit/8ed0c1c22c)] - **net**: fix dns lookup for android (Josh Dague) [#4580](https://github.com/nodejs/node/pull/4580)
* [[`15fa555204`](https://github.com/nodejs/node/commit/15fa555204)] - **net, doc**: fix line wrapping lint in net.js (James M Snell) [#4588](https://github.com/nodejs/node/pull/4588)
* [[`1b070e48e0`](https://github.com/nodejs/node/commit/1b070e48e0)] - **node_contextify**: do not incept debug context (Myles Borins) [#4815](https://github.com/nodejs/node/issues/4815)
* [[`4fbcb47fe9`](https://github.com/nodejs/node/commit/4fbcb47fe9)] - **readline**: Remove XXX and output debuglog (Kohei TAKATA) [#4690](https://github.com/nodejs/node/pull/4690)
* [[`26f02405d0`](https://github.com/nodejs/node/commit/26f02405d0)] - **repl**: make sure historyPath is trimmed (Evan Lucas) [#4539](https://github.com/nodejs/node/pull/4539)
* [[`5990ba2a0a`](https://github.com/nodejs/node/commit/5990ba2a0a)] - **src**: remove redeclarations of variables (Rich Trott) [#4605](https://github.com/nodejs/node/pull/4605)
* [[`c41ed59dbc`](https://github.com/nodejs/node/commit/c41ed59dbc)] - **src**: don't check failure with ERR_peek_error() (Ben Noordhuis) [#4731](https://github.com/nodejs/node/pull/4731)
* [[`d71f9992f9`](https://github.com/nodejs/node/commit/d71f9992f9)] - **stream**: remove useless if test in transform (zoubin) [#4617](https://github.com/nodejs/node/pull/4617)
* [[`f205e9920e`](https://github.com/nodejs/node/commit/f205e9920e)] - **test**: fix tls-no-rsa-key flakiness (Santiago Gimeno) [#4043](https://github.com/nodejs/node/pull/4043)
* [[`447347cd62`](https://github.com/nodejs/node/commit/447347cd62)] - **test**: fix issues for space-in-parens ESLint rule (Roman Reiss) [#4753](https://github.com/nodejs/node/pull/4753)
* [[`be8274508c`](https://github.com/nodejs/node/commit/be8274508c)] - **test**: improve test-cluster-disconnect-suicide-race (Rich Trott) [#4739](https://github.com/nodejs/node/pull/4739)
* [[`0178001163`](https://github.com/nodejs/node/commit/0178001163)] - **test**: make test-cluster-disconnect-leak reliable (Rich Trott) [#4736](https://github.com/nodejs/node/pull/4736)
* [[`d615757da2`](https://github.com/nodejs/node/commit/d615757da2)] - **test**: fix flaky test-net-socket-local-address (cjihrig) [#4650](https://github.com/nodejs/node/pull/4650)
* [[`baa0a3dff5`](https://github.com/nodejs/node/commit/baa0a3dff5)] - **test**: fix race in test-net-server-pause-on-connect (Rich Trott) [#4637](https://github.com/nodejs/node/pull/4637)
* [[`909b5167cb`](https://github.com/nodejs/node/commit/909b5167cb)] - **test**: remove 1 second delay from test (Rich Trott) [#4616](https://github.com/nodejs/node/pull/4616)
* [[`8ea76608ed`](https://github.com/nodejs/node/commit/8ea76608ed)] - **test**: move resource intensive tests to sequential (Rich Trott) [#4615](https://github.com/nodejs/node/pull/4615)
* [[`7afcdd358e`](https://github.com/nodejs/node/commit/7afcdd358e)] - **test**: require common module only once (Rich Trott) [#4611](https://github.com/nodejs/node/pull/4611)
* [[`0e02eb0bbe`](https://github.com/nodejs/node/commit/0e02eb0bbe)] - **test**: only include http module once (Rich Trott) [#4606](https://github.com/nodejs/node/pull/4606)
* [[`34d9e48bb6`](https://github.com/nodejs/node/commit/34d9e48bb6)] - **test**: fix `http-upgrade-client` flakiness (Santiago Gimeno) [#4602](https://github.com/nodejs/node/pull/4602)
* [[`556703d531`](https://github.com/nodejs/node/commit/556703d531)] - **test**: fix flaky unrefed timers test (Rich Trott) [#4599](https://github.com/nodejs/node/pull/4599)
* [[`3d5bc69796`](https://github.com/nodejs/node/commit/3d5bc69796)] - **test**: fix `http-upgrade-agent` flakiness (Santiago Gimeno) [#4520](https://github.com/nodejs/node/pull/4520)
* [[`ec24d3767b`](https://github.com/nodejs/node/commit/ec24d3767b)] - **test**: fix flaky test-cluster-shared-leak (Rich Trott) [#4510](https://github.com/nodejs/node/pull/4510)
* [[`a256790327`](https://github.com/nodejs/node/commit/a256790327)] - **test**: fix flaky cluster-net-send (Brian White) [#4444](https://github.com/nodejs/node/pull/4444)
* [[`6809c2be1a`](https://github.com/nodejs/node/commit/6809c2be1a)] - **test**: fix flaky child-process-fork-regr-gh-2847 (Brian White) [#4442](https://github.com/nodejs/node/pull/4442)
* [[`e6448aa36b`](https://github.com/nodejs/node/commit/e6448aa36b)] - **test**: use addon.md block headings as test dir names (Rod Vagg) [#4412](https://github.com/nodejs/node/pull/4412)
* [[`305d340fca`](https://github.com/nodejs/node/commit/305d340fca)] - **test**: test each block in addon.md contains js & cc (Rod Vagg) [#4411](https://github.com/nodejs/node/pull/4411)
* [[`f213406575`](https://github.com/nodejs/node/commit/f213406575)] - **test**: fix tls-multi-key race condition (Santiago Gimeno) [#3966](https://github.com/nodejs/node/pull/3966)
* [[`607f545568`](https://github.com/nodejs/node/commit/607f545568)] - **test**: fix style issues after eslint update (Michaël Zasso) [nodejs/io.js#2286](https://github.com/nodejs/io.js/pull/2286)
* [[`aefb20a94f`](https://github.com/nodejs/node/commit/aefb20a94f)] - **tls**: copy client CAs and cert store on CertCb (Fedor Indutny) [#3537](https://github.com/nodejs/node/pull/3537)
* [[`7821b3e305`](https://github.com/nodejs/node/commit/7821b3e305)] - **tls_legacy**: do not read on OpenSSL's stack (Fedor Indutny) [#4624](https://github.com/nodejs/node/pull/4624)
* [[`b66db49f94`](https://github.com/nodejs/node/commit/b66db49f94)] - **tools**: add support for subkeys in release tools (Myles Borins) [#4807](https://github.com/nodejs/node/pull/4807)
* [[`837ebd1985`](https://github.com/nodejs/node/commit/837ebd1985)] - **tools**: enable space-in-parens ESLint rule (Roman Reiss) [#4753](https://github.com/nodejs/node/pull/4753)
* [[`066d5e7da2`](https://github.com/nodejs/node/commit/066d5e7da2)] - **tools**: fix style issue after eslint update (Michaël Zasso) [nodejs/io.js#2286](https://github.com/nodejs/io.js/pull/2286)
* [[`b20ea69f46`](https://github.com/nodejs/node/commit/b20ea69f46)] - **tools**: update eslint config (Michaël Zasso) [nodejs/io.js#2286](https://github.com/nodejs/io.js/pull/2286)
* [[`2e0352d50c`](https://github.com/nodejs/node/commit/2e0352d50c)] - **tools**: update eslint to v1.10.3 (Michaël Zasso) [nodejs/io.js#2286](https://github.com/nodejs/io.js/pull/2286)
* [[`c96800a432`](https://github.com/nodejs/node/commit/c96800a432)] - **tools**: fix license-builder.sh for ICU (Richard Lau) [#4762](https://github.com/nodejs/node/pull/4762)
* [[`720b03dca7`](https://github.com/nodejs/node/commit/720b03dca7)] - **tools**: add license-builder.sh to construct LICENSE (Rod Vagg) [#4194](https://github.com/nodejs/node/pull/4194)

## 2016-02-09, Version 4.3.0 'Argon' (LTS), @jasnell

This is an important security release. All Node.js users should consult the security release summary at nodejs.org for details on patched vulnerabilities.
Expand Down
9 changes: 6 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
## Code of Conduct

This Code of Conduct is adapted from [Rust's wonderful
CoC](http://www.rust-lang.org/conduct.html).
CoC](http://www.rust-lang.org/conduct.html) as well as the
[Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).

* We are committed to providing a friendly, safe and welcoming
environment for all, regardless of gender, sexual orientation,
disability, ethnicity, religion, or similar personal characteristic.
environment for all, regardless of level of experience, gender
identity and expression, sexual orientation, disability,
personal appearance, body size, race, ethnicity, age, religion,
nationality, or other similar characteristic.
* Please avoid using overtly sexual nicknames or other nicknames that
might detract from a friendly, safe and welcoming environment for
all.
Expand Down
Loading