Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Merge fe730d3 as of 2017-07-03 #329

Merged
merged 26 commits into from
Jul 6, 2017
Merged

Merge fe730d3 as of 2017-07-03 #329

merged 26 commits into from
Jul 6, 2017

Conversation

kfarnung
Copy link
Contributor

@kfarnung kfarnung commented Jul 6, 2017

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

chakrashim

gromnitsky and others added 23 commits July 2, 2017 21:44
@gromnitsky @tniessen
doc: fix some broken references
ea927b3 
PR-URL: nodejs/node#13811
Reviewed-By: Jackson Tian <shyvo1987@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
@tniessen
test: replace indexOf with includes and startsWith
20b00f3 
PR-URL: nodejs/node#13852
Refs: nodejs/node#12586
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
@matejkrajcovic @tniessen
doc: add default values to functions in fs.md
51bb4ac 
PR-URL: nodejs/node#13767
Refs: nodejs/node#11135
Refs: nodejs/node#13769
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@refack
test: mark test-npm-install flaky on arm
ed19a18 
PR-URL: nodejs/node#14035
Refs: nodejs/node#14015
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@rus0000 @tniessen
doc: fix example in child_process.md
0794c10 
PR-URL: nodejs/node#13716
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
@oliverchang @Trott
deps: cherry-pick 3f4536894ac from V8 upstream
31349e2 
Original commit message:

    d8: Make in process stack dumping optional

    Adds a flag (--disable-in-process-stack-traces) to not install
    signal handlers so that e.g. ASan signal handlers will work.

    This flag mirrors chromium's one.

    R=jochen@chromium.org
    BUG=chromium:716235

    Review-Url: https://codereview.chromium.org/2854173002
    Cr-Commit-Position: refs/heads/master@{#45142}

PR-URL: nodejs/node#13985
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@addaleax @Trott
src: fix process.abort() interaction with V8
4dff05f 
Since V8 5.9 V8 installs a default signal handler for some signals
when creating a default platform instance that prints a stack trace.

However, Node already does the same thing, so it would seem like the
two different stack traces would be printed; also, the V8 handler
would lead to a `SIGSEGV` under some circumstances, rather than
letting the abort continue normally.

Resolve this by disabling V8’s signal handler by default.

PR-URL: nodejs/node#13985
Fixes: nodejs/node#13865
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@BridgeAR @refack
tools: change var to const in ./doc/addon-verify
bce27c2 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@BridgeAR @refack
tools: change var to const in ./doc/html
0808989 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@BridgeAR @refack
tools: change var to const in ./doc/json
461049f 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@BridgeAR @refack
tools: change var to const in ./doc/preprocess
a7e1cee 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@BridgeAR @refack
tools: change var to const in ./eslint-rules
ea67c27 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@BridgeAR @refack
tools: change var to const in ./license2rtf
a5347c9 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@BridgeAR @refack
test: change var to const in ./common
017122a 
PR-URL: nodejs/node#13732
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@Trott
test: refactor test-http-hostname-typechecking
5bbae25 
* Use common.mustCall() to confirm callback is invoked.
* Change spacing of require statements to conform to test-writing guide.

PR-URL: nodejs/node#13993
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@BridgeAR @refack
doc,assert: document stackStartFunction in fail
7a2b3e2 
PR-URL: nodejs/node#13862
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@BridgeAR @refack
assert: refactor the code
0455fff 
1. Rename private functions
2. Use destructuring
3. Remove obsolete comments

PR-URL: nodejs/node#13862
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@Trott
test: refactor test-http-invalidheaderfield
9955c30 
* use common.mustNotCall() to confirm callback is not invoked
* whitespace change per test-writing guide

PR-URL: nodejs/node#13996
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@watilde
doc: fix api docs style
8b2c61c 
doc/api/cluster.md
  L337: Use the definition link

doc/api/deprecations.md
  L106: Fix the definition link name

doc/api/errors.md
  L901: Remove unused definition

PR-URL: nodejs/node#13970
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Cai <davidcai1993@yahoo.com>
@tniessen
assert: fix incorrect use of ERR_INVALID_ARG_TYPE
1d74143 
PR-URL: nodejs/node#14011
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@tniessen
path: fix incorrect use of ERR_INVALID_ARG_TYPE
44256bb 
PR-URL: nodejs/node#14011
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@tniessen
child_process: use internal/errors
fe730d3 
PR-URL: nodejs/node#14009
Refs: nodejs/node#11273
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@kfarnung
Merge nodejs/master
a6e02dd 
Merge fe730d3 as of 2017-07-03.
This is an automatically created merge. For any problems please
contact @kunalspathak.
@kfarnung kfarnung self-assigned this Jul 6, 2017
@kfarnung
Copy link
Contributor Author

kfarnung commented Jul 6, 2017

CI: https://ci.nodejs.org/job/chakracore-test-pull-request/99/

@MSLaguana
Copy link
Contributor

Looks like CI linter is angry:

Running C++ linter...
src/node_api_jsrt.cc:587:  Lines should be <= 80 characters long  [whitespace/line_length] [2]
Total errors found: 1

@kfarnung
Copy link
Contributor Author

kfarnung commented Jul 6, 2017

@MSLaguana I took your change from nodejs/node#14111 as well.

@kfarnung
Copy link
Contributor Author

kfarnung commented Jul 6, 2017

New CI: https://ci.nodejs.org/job/chakracore-test-pull-request/100/

@kfarnung
Copy link
Contributor Author

kfarnung commented Jul 6, 2017

CI looks good

@kfarnung kfarnung force-pushed the _NodeJsFIPump_temp__07062017102924 branch from 9a54b7e to 19f2680 Compare July 6, 2017 21:46
kfarnung added 2 commits July 6, 2017 14:48
@kfarnung
chakrashim: updating platform shim
1417fa2 
PR-URL: nodejs#329
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
@kfarnung
src: fix cpplint error
1b50f3d 
PR-URL: nodejs#329
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
@kfarnung kfarnung force-pushed the _NodeJsFIPump_temp__07062017102924 branch from 19f2680 to a13f81b Compare July 6, 2017 21:51
kfarnung pushed a commit to kfarnung/node-chakracore that referenced this pull request Jul 6, 2017
@MSLaguana @kfarnung
cctest: Fix cctest failure on windows
a13f81b 
Linux converts the ipv6 address "::" to "::1", while windows does not.
By explicitly using "::1" in the test we allow it to succeed on windows.

PR-URL: nodejs#329
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
@MSLaguana @kfarnung
cctest: Fix cctest failure on windows
1477c31 
Linux converts the ipv6 address "::" to "::1", while windows does not.
By explicitly using "::1" in the test we allow it to succeed on windows.

PR-URL: nodejs#329
Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>
@kfarnung kfarnung force-pushed the _NodeJsFIPump_temp__07062017102924 branch from a13f81b to 1477c31 Compare July 6, 2017 21:52
@kfarnung kfarnung merged commit 1477c31 into nodejs:master Jul 6, 2017
@kfarnung kfarnung deleted the _NodeJsFIPump_temp__07062017102924 branch July 6, 2017 21:53
kfarnung added a commit to kfarnung/node-chakracore that referenced this pull request Jul 21, 2017
@kfarnung
src: fix cpplint error
91485fc 
PR-URL: nodejs#329
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
kfarnung added a commit that referenced this pull request Aug 10, 2017
@kfarnung
chakrashim: updating platform shim
281cd64 
PR-URL: #329
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@MSLaguana MSLaguana MSLaguana approved these changes

@digitalinfinity digitalinfinity Awaiting requested review from digitalinfinity

@kunalspathak kunalspathak Awaiting requested review from kunalspathak

Assignees

@kfarnung kfarnung

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.