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.

Sign up for GitHub

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

Jump to bottom

Propose v6.3.0 #7441

Merged
merged 131 commits into from
Jul 5, 2016
Merged

Propose v6.3.0 #7441

merged 131 commits into from
Jul 5, 2016

Conversation

Fishrock123
Copy link
Contributor

@Fishrock123 Fishrock123 commented Jun 27, 2016 •
edited
Loading

I may have gotten some of the merge conflicts wrong.

Release hopefully this week?

CI: https://ci.nodejs.org/job/node-test-pull-request/3090/

  • [ac8e1bf609] - buffer: improve creation performance. (Ingvar Stepanyan) #7349
  • [db708a750c] - crypto: update root certificates (Ben Noordhuis) #7363
  • [8e927c7589] - crypto,tls: perf improvements for crypto and tls getCiphers (James M Snell) #7225
  • [ae1767635e] - deps: upgrade npm to 3.10.2 (Rebecca Turner) #7410
  • [c544213717] - deps: backport 7dfb5beeec from V8 upstream (Myles Borins) #7348
  • [aa79aaf280] - doc: add CTC meeting minutes 2016-06-15 (Josh Gavant) #7320
  • [ba8dac991e] - doc: minor rewording to the GitHub issue/pr templates (Jeremiah Senkpiel) #7403
  • [c4d3580eb1] - doc: add lance to collaborators (Lance Ball) #7407
  • [b5e9010450] - doc: update "who to cc in issues" chart (Jeremiah Senkpiel) #6694
  • [6d9549c255] - doc: fix link in the stream doc (Italo A. Casas) #7347
  • [d584c64c0b] - doc: fix repl defineCommand example (akki) #7365
  • [924e4f8117] - doc: update build instructions for Windows (João Reis) #7285
  • [98b7cd6c61] - doc: add added: information for tls (Italo A. Casas) #7018
  • [e6135baed3] - doc: mention http request "aborted" events (Kyle E. Mitchell) #7270
  • [7a17139725] - doc: add RReverser to collaborators (Ingvar Stepanyan) #7370
  • [d73c99f071] - doc: add argument information for socket.destroy() (Rich Trott) #7238
  • [22f3336562] - doc: general improvements to os.md copy (James M Snell) #7124
  • [e7279f1afb] - doc: fix typos in the stream doc (vsemozhetbyt) #7336
  • [5c6e24e9c1] - doc: document socket.destroyed (Tushar Mathur) #6128
  • [cd7c29e471] - doc: correct added: information for fs.access (Richard Lau) #7299
  • [6aa179b4a6] - doc: add added: information for repl (Anna Henningsen) #7256
  • [08a9aa31e1] - doc: fix broken link in vm.md (Luigi Pinca) #7304
  • [12fbac102b] - doc: fix cluster worker 'message' event (cjihrig) #7309
  • [1a0ed26883] - doc: fix events typo (Greyson Parrelli) #7329
  • [1e7a7be1ad] - doc: clarify fs.access works on directories too. (Lance Ball) #7321
  • [04c3878f51] - punycode: update to v2.0.0 (Mathias Bynens) #7267
  • [c521249908] - (SEMVER-MINOR) readline: allow passing prompt to constructor (Evan Lucas) #7125
  • [da1dffb535] - (SEMVER-MINOR) readline: return old status from _setRawMode (Anna Henningsen) #6635
  • [e4db71638b] - repl: fix tab completion for defined commands (Prince J Wesley) #7364
  • [aad7d4164d] - (SEMVER-MINOR) repl: break on sigint/ctrl+c (Anna Henningsen) #6635
  • [d8fee367af] - (SEMVER-MINOR) src: add node::FreeEnvironment public API (Cheng Zhao) #3098
  • [bfcc650eed] - (SEMVER-MINOR) src: refactor require('constants') (James M Snell) #6534
  • [cd38401724] - src: fix Windows segfault with --eval (Bryce Simonds) #6938
  • [6dc0dae830] - src: rename "node" script to "bootstrap_node" (Daniel Bevenius) #7277
  • [5f35204c9e] - (SEMVER-MINOR) stream: improve Readable.read() performance (Brian White) #7077
  • [4e99bf600b] - string_decoder: fix bad utf8 character handling (Brian White) #7310
  • [f4a067b856] - _Revert_ "test: mark test-vm-timeout flaky on windows" (Anna Henningsen) #7373
  • [dad15cc624] - test: fix flaky test-vm-timeout (Anna Henningsen) #7373
  • [044a0be46f] - test: add test for exec() known issue (Rich Trott) #7375
  • [bf18e04916] - test: add more UTF-8 StringDecoder tests (Martin von Gagern) #7310
  • [4000e0e08b] - test: fix flaky test-fs-watch-encoding on OS X (Rich Trott) #7356
  • [610f40d230] - test: remove internet/test-tls-connnect-cnnic (Ben Noordhuis) #7363
  • [5e48925cd6] - test: mark test-vm-timeout flaky on windows (Rich Trott) #7359
  • [e22205bc7d] - test: refresh the tmpdir before using (Rich Trott) #7327
  • [e2bf250a29] - test: add tests for some stream.Readable uses (Anna Henningsen) #7260
  • [f3951728cc] - tls: avoid calling Buffer.byteLength multiple times (James M Snell) #7236
  • [92913a0a60] - tools: output include guards in mk-ca-bundle.pl (Ben Noordhuis) #7363
  • [59f9127bd9] - tools: update certdata.txt (Ben Noordhuis) #7363
  • [14e542eaf4] - vm: test for abort condition of current invocation (Anna Henningsen) #7373
  • [14d37949ec] - (SEMVER-MINOR) vm: add ability to break on sigint/ctrl+c (Anna Henningsen) #6635

@Fishrock123 Fishrock123 added meta Issues and PRs related to the general management of the project. v6.x labels Jun 27, 2016
@nodejs-github-bot nodejs-github-bot added doc Issues and PRs related to the documentations. npm Issues and PRs related to the npm client dependency or the npm registry. labels Jun 27, 2016
@mscdex mscdex removed doc Issues and PRs related to the documentations. npm Issues and PRs related to the npm client dependency or the npm registry. labels Jun 27, 2016
@Fishrock123
Copy link
Contributor Author

ok rebase is messed up, idk why

@bricss
Copy link

bricss commented Jun 29, 2016

It would be great to see V8 5.1 landed with this release 😃

@evanlucas
Copy link
Contributor

@Fishrock123 that could have been my fault. I had started cherry-picking a few commits on Monday morning.

Also, no v8_inspector?

@Fishrock123
Copy link
Contributor Author

@evanlucas I hadn't realized that the necessary things were in to pull in the inspector so I didn't remove the labels.

Considering this will end up being next week we can probably go and untag those if it is to land. That means 1-2 other things can probably also be untagged. (the dont-land-on tag can be removed I mean)

@NawarA
Copy link

NawarA commented Jun 30, 2016 •
edited
Loading

@targos do you think we can get v8 5.1 ( which I believe is semver-minor ) on this upcoming release?

@targos
Copy link
Member

targos commented Jul 1, 2016

I think we should wait until we are quite sure that there are no breaking ABI changes

@Salakar
Copy link

Salakar commented Jul 1, 2016

@bricss @NawarA also interested in seeing v8 5.1 land, especially for the perf improvements and garbage collection changes.

WOO

@rvagg
Copy link
Member

rvagg commented Jul 5, 2016

re V8 5.1, I left a note about that here for anyone that's overly excited about it. TL;DR: it's not coming in this release.

@Fishrock123
Copy link
Contributor Author

Ugh, lots of conflicts with the inspector. Going to try resolving when I'm back later today.

@Fishrock123 Fishrock123 force-pushed the propose-v6.3.0 branch 2 times, most recently from e4107f2 to 7df3cd1 Compare July 5, 2016 19:08
@Fishrock123
Copy link
Contributor Author

CI: https://ci.nodejs.org/job/node-test-pull-request/3183/

There should be 6 failures I think...

I know how to resolve 1, I suspect the other 5 come from some util.format() change...

@addaleax
Copy link
Member

addaleax commented Jul 5, 2016

ba628ef for those format changes, maybe that entire PR shouldn’t be in here?

@Fishrock123
Copy link
Contributor Author

@addaleax I think you are right, strange that those are on master? Those should have landed in #7016 I think?

@Fishrock123
Copy link
Contributor Author

Ah, I think the Upgrade v8 PR probably included those without updating the URLs? cc @ofrobots, that practice could cause problems such as this

@addaleax
Copy link
Member

addaleax commented Jul 5, 2016 •
edited
Loading

Yep… looks like they were landed as part of #7016, just with their old PR-URL.

jasnell and others added 8 commits July 5, 2016 22:09
@jasnell @Fishrock123
src: refactor require('constants')
929b6c2 
The require('constants') module is currently undocumented and mashes
together unrelated constants. This refactors the require('constants')
in favor of distinct os.constants, fs.constants, and crypto.constants
that are specific to the modules for which they are relevant. The
next step is to document those within the specific modules.

PR-URL: #6534
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Robert Lindstaedt <[email protected]>

 Conflicts:
	doc/api/fs.md
@zcbenz @Fishrock123
src: add node::FreeEnvironment public API
2a8bd35 
Since debugger::Agent's interface is not exported, third party embedders
will have linking errors if they call Environment's destructor directly.

PR-URL: #3098
Reviewed-By: Ben Noordhuis <[email protected]>
@ofrobots @Fishrock123
deps: import v8_inspector
6210528 
Pick up v8 inspector from [1]. This is the standalone version of the
devtools debug protocol.

[1] pavelfeldman/v8_inspector@e1bb206

PR-URL: #6792
Reviewed-By: jasnell - James M Snell <[email protected]>
Reviewed-By: addaleax - Anna Henningsen <[email protected]>
Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
@pavelfeldman @Fishrock123
src,lib: v8-inspector support
7d4f038 
This change introduces experimental v8-inspector support. This brings
the DevTools debug protocol allowing Node.js to be debugged with
Chrome DevTools native, or through other debuggers supporting that
protocol.

Partial WebSocket support, to the extent required by DevTools, is
included. This is derived from the implementation in Blink.

v8-inspector support can be disabled by the --without-inspector
configure flag.

PR-URL: #6792
Reviewed-By: jasnell - James M Snell <[email protected]>
Reviewed-By: addaleax - Anna Henningsen <[email protected]>
Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
@cjihrig @Fishrock123
cluster: work with v8_inspector
c1bd3fe 
PR-URL: #6792
Reviewed-By: jasnell - James M Snell <[email protected]>
Reviewed-By: addaleax - Anna Henningsen <[email protected]>
Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
@addaleax @Fishrock123
src: fix --without-inspector build
ea2d661 
Use `HAVE_INSPECTOR` as the 0/1 boolean macro that it is, as opposed
to a defined/not-defined boolean.

PR-URL: #7078
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
@nicolasromer @Fishrock123
src: add linebreak to inspector message
643b33b 
Add linebreak to inspector ready message to wrap properly in
80 column (default) terminal windows.

Fixes: #7067
PR-URL: #7070
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Claudio Rodriguez <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
@ofrobots @Fishrock123
deps: update v8_inspector
f4777c7 
Pick the latest v8_inspector [1] with:
* V8 5.1 compatibility
* Modify parse builder templates to make coverity happy
* The whitespace differences in the jinja2 sub-dependency do exist
  upstream. I am not sure how I missed them in the original import
  (ed2eac).

[1] pavelfeldman/v8_inspector@3b56732

PR-URL: #7118
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Trott and others added 7 commits July 5, 2016 22:36
@Trott @Fishrock123
doc: improve usage of zero/0
7d07a0b 
PR-URL: #7466
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Bryan English <[email protected]>
Reviewed-By: Brian White <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@Trott @Fishrock123
test: remove common.PORT from http tests
b383fdd 
PR-URL: #7467
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Brian White <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Santiago Gimeno <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@ryanmurakami @Fishrock123
doc: add guide for Node.js Timers
45f83e5 
Refs: nodejs/docs#76
PR-URL: #6825
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Sakthipriyan Vairamani <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
@joaocgreis @Fishrock123
build: split CI rules in Makefile
9b5be44 
Some CI jobs compile Node and run the tests on different machines.
This change enables collaborators to have finer control over what runs
on these jobs, such as the exact suites to run. The test-ci rule was
split into js and native, to allow for addons to be compiled only on
the machines that are going to run them.

Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Santiago Gimeno <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Rod Vagg <[email protected]>
PR-URL: #7317
@Trott @Fishrock123
test: handle SmartOS bug in test-tls-session-cache
6da49ac 
Sometimes, a SmartOS bug results in ECONNREFUSED when trying to connect
to the TLS server that the test starts. Retry in that situation.

Fixes: #5111
Refs: https://smartos.org/bugview/OS-2767
PR-URL: #7505
Reviewed-By: Santiago Gimeno <[email protected]>
@bnoordhuis @Fishrock123
test: listen on and connect to 127.0.0.1
c132e9c 
Avoid transient DNS issues in test sequential/test-net-GH-5504 by using
the IP address instead of the 'localhost' host name.

Fixes: #6611
PR-URL: #7524
Reviewed-By: Brian White <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Santiago Gimeno <[email protected]>
@tarungarg546 @Fishrock123
doc: fix documentation of process.argv
63d361b 
The current documentation states that if run something like
`node app.js` then in our process.argv array first elements is `node`,
but actually it's `process.execPath` not `node`
as documentation currently suggests.

Fixes: #7434
PR-URL: #7449
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Brian White <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@Fishrock123
Copy link
Contributor Author

Updated, this should pass the CI. https://ci.nodejs.org/job/node-test-pull-request/3184/

I still have an odd npm problem to sort out though: #7515 (comment)

@Fishrock123
Copy link
Contributor Author

Oh, and I also need to get #7546 & f8d3f6f into it.

@Fishrock123 Fishrock123 mentioned this pull request Jul 5, 2016
Closed
@Fishrock123 Fishrock123 merged commit 63d361b into v6.x Jul 5, 2016
@Fishrock123
Copy link
Contributor Author

oh, thanks github

@Fishrock123
Copy link
Contributor Author

Great, now I can't reopen this either :(

@Fishrock123 Fishrock123 mentioned this pull request Jul 5, 2016
Merged
@ofrobots
Copy link
Contributor

ofrobots commented Jul 6, 2016 •
edited
Loading

@Fishrock123: this is the rationale used for the PR-URL for cherry-picks on deps/v8:

If they are clean cherry-picks or with only minuscule tweaks, I'd keep the original PR-URL.

EDIT: I'm on vacation this week – will be slow to respond.

@rvagg
Copy link
Member

rvagg commented Jul 6, 2016

Agreed ^, I've done it a few times when it's not clean and indented the original commit message including PR-URL and put new details at the top-level. Unfortunately changelog-maker doesn't know what to make of this and picks up the first one it finds (iirc) so we'll need to address this if we do it often. It really should just be looking for the least indented PR-URL, or even being strict and looking for ^PR-URL.

Fishrock123 added a commit that referenced this pull request Jul 6, 2016
@Fishrock123
2016-07-06, Version 6.3.0 (Current)
50aede5 
Notable changes:

* buffer: Added `buffer.swap64()` to compliment `swap16()` &
`swap32()`. (Zach Bjornson) #7157
* build: New `configure` options have been added for building Node.js
as a shared library. (Stefan Budeanu)
#6994
  - The options are: `--shared`, `--without-v8-platform` &
`--without-bundled-v8`.
* crypto: Root certificates have been updated. (Ben Noordhuis)
#7363
* debugger: The server address is now configurable via
`--debug=<address>:<port>`. (Ben Noordhuis)
#3316
* npm: Upgraded npm to v3.10.3 (Kat Marchán)
#7515 & (Rebecca Turner)
#7410
* readline: Added the `prompt` option to the readline constructor.
(Evan Lucas) #7125
* repl / vm: `sigint`/`ctrl+c` will now break out of infinite loops
without stopping the Node.js instance. (Anna Henningsen)
#6635
* src:
  - Added a `node::FreeEnvironment` public C++ API. (Cheng Zhao)
#3098
  - Refactored `require('constants')`, constants are now available
directly from their respective modules. (James M Snell)
#6534
* stream: Improved `readable.read()` performance by up to 70%. (Brian
White) #7077
* timers: `setImmediate()` is now up to 150% faster in some situations.
(Andras) #6436
* util: Added a `breakLength` option to `util.inspect()` to control how
objects are formatted across lines. (cjihrig)
#7499
* v8-inspector: Experimental support has been added for debugging
Node.js over the inspector protocol. (Ali Ijaz Sheikh)
#6792
  - *Note: This feature is experimental, and it could be altered or
removed.*
  - You can try this feature by running Node.js with the `--inspect`
flag.

Refs: #7441
PR-URL: #7550
Fishrock123 added a commit that referenced this pull request Jul 6, 2016
@Fishrock123
Working on v6.3.1
db2bd40 
Refs: #7441
PR-URL: #7550
Fishrock123 added a commit that referenced this pull request Jul 6, 2016
@Fishrock123
2016-07-06, Version 6.3.0 (Current)
9fc01b1 
Notable changes:

* buffer: Added `buffer.swap64()` to compliment `swap16()` &
`swap32()`. (Zach Bjornson) #7157
* build: New `configure` options have been added for building Node.js
as a shared library. (Stefan Budeanu)
#6994
  - The options are: `--shared`, `--without-v8-platform` &
`--without-bundled-v8`.
* crypto: Root certificates have been updated. (Ben Noordhuis)
#7363
* debugger: The server address is now configurable via
`--debug=<address>:<port>`. (Ben Noordhuis)
#3316
* npm: Upgraded npm to v3.10.3 (Kat Marchán)
#7515 & (Rebecca Turner)
#7410
* readline: Added the `prompt` option to the readline constructor.
(Evan Lucas) #7125
* repl / vm: `sigint`/`ctrl+c` will now break out of infinite loops
without stopping the Node.js instance. (Anna Henningsen)
#6635
* src:
  - Added a `node::FreeEnvironment` public C++ API. (Cheng Zhao)
#3098
  - Refactored `require('constants')`, constants are now available
directly from their respective modules. (James M Snell)
#6534
* stream: Improved `readable.read()` performance by up to 70%. (Brian
White) #7077
* timers: `setImmediate()` is now up to 150% faster in some situations.
(Andras) #6436
* util: Added a `breakLength` option to `util.inspect()` to control how
objects are formatted across lines. (cjihrig)
#7499
* v8-inspector: Experimental support has been added for debugging
Node.js over the inspector protocol. (Ali Ijaz Sheikh)
#6792
  - *Note: This feature is experimental, and it could be altered or
removed.*
  - You can try this feature by running Node.js with the `--inspect`
flag.

Refs: #7441
PR-URL: #7550
Fishrock123 added a commit that referenced this pull request Jul 6, 2016
@Fishrock123
Working on v6.3.1
ba1c7ad 
Refs: #7441
PR-URL: #7550
Fishrock123 added a commit that referenced this pull request Jul 6, 2016
@Fishrock123
2016-07-06, Version 6.3.0 (Current)
7628031 
Notable changes:

* buffer: Added `buffer.swap64()` to compliment `swap16()` &
`swap32()`. (Zach Bjornson) #7157
* build: New `configure` options have been added for building Node.js
as a shared library. (Stefan Budeanu)
#6994
  - The options are: `--shared`, `--without-v8-platform` &
`--without-bundled-v8`.
* crypto: Root certificates have been updated. (Ben Noordhuis)
#7363
* debugger: The server address is now configurable via
`--debug=<address>:<port>`. (Ben Noordhuis)
#3316
* npm: Upgraded npm to v3.10.3 (Kat Marchán)
#7515 & (Rebecca Turner)
#7410
* readline: Added the `prompt` option to the readline constructor.
(Evan Lucas) #7125
* repl / vm: `sigint`/`ctrl+c` will now break out of infinite loops
without stopping the Node.js instance. (Anna Henningsen)
#6635
* src:
  - Added a `node::FreeEnvironment` public C++ API. (Cheng Zhao)
#3098
  - Refactored `require('constants')`, constants are now available
directly from their respective modules. (James M Snell)
#6534
* stream: Improved `readable.read()` performance by up to 70%. (Brian
White) #7077
* timers: `setImmediate()` is now up to 150% faster in some situations.
(Andras) #6436
* util: Added a `breakLength` option to `util.inspect()` to control how
objects are formatted across lines. (cjihrig)
#7499
* v8-inspector: Experimental support has been added for debugging
Node.js over the inspector protocol. (Ali Ijaz Sheikh)
#6792
  - *Note: This feature is experimental, and it could be altered or
removed.*
  - You can try this feature by running Node.js with the `--inspect`
flag.

Refs: #7441
PR-URL: #7550
Starefossen pushed a commit to Starefossen/docker-node that referenced this pull request Jul 6, 2016
Upgrade Node to 6.3.0
288d1c6 
PR-URL: nodejs#86

Related: nodejs/node#7550, nodejs/node#7441

Signed-off-by: Hans Kristian Flaatten <[email protected]>
Starefossen pushed a commit to nodejs/docker-node that referenced this pull request Jul 6, 2016
Upgrade Node to 6.3.0
6a984d5 
PR-URL: #209

Related: nodejs/node#7550, nodejs/node#7441

Signed-off-by: Hans Kristian Flaatten <[email protected]>
@Starefossen Starefossen mentioned this pull request Jul 6, 2016
Merged
Starefossen pushed a commit to Starefossen/official-images that referenced this pull request Jul 6, 2016
Upgrade Node to 6.3.0
1456b32 
PR-URL: docker-library#1922

Related: nodejs/docker-node#210, nodejs/node#7550, nodejs/node#7441

Signed-off-by: Hans Kristian Flaatten <[email protected]>
@Starefossen Starefossen mentioned this pull request Jul 6, 2016
Merged
geminiyellow added a commit to ilivebox/heroku-nodejs that referenced this pull request Jul 7, 2016
@geminiyellow
Upgrade Node to 6.3.0
e9c7b1b 
PR-URL: #209

Related: nodejs/node#7550, nodejs/node#7441

Signed-off-by: Hans Kristian Flaatten <[email protected]>
@geminiyellow geminiyellow mentioned this pull request Jul 7, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@koluch1i koluch1i koluch1i approved these changes

Assignees
No one assigned
Labels
meta Issues and PRs related to the general management of the project.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.