This repository was archived by the owner on Oct 15, 2020. It is now read-only.
Merge nodejs/master #321
Merged
Merge nodejs/master #321
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Error value was not checked. Turns out, uv_ip6_addr was actually called on malformed IP (square brackets should not have been included). PR-URL: nodejs/node#13799 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
Mention that the staging branch should be rebased on top of the release branch after merging a release proposal. PR-URL: nodejs/node#13742 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]>
Fixes `this.push(undefined)`. Fixes: nodejs/node#13753 PR-URL: nodejs/node#13760 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Calvin Metcalf <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
V8 will crash if escape is called twice on the same scope. Add checks to avoid crashing if napi_escape_scope() is called to try and do this. Add test that tries to call napi_create_scope() twice. PR-URL: nodejs/node#13651 Reviewed-By: Jason Ginchereau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
PR-URL: nodejs/node#13820 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: David Cai <[email protected]>
This seems to have been removed inadvertently by 330c8d7 in PR 12925. PR-URL: nodejs/node#13838 Reviewed-By: Vse Mozhet Byt <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
The error message might be misleading if an object property was the issue and not the argument itself. Fix this by checking if a argument or a property is passed to the handler function. PR-URL: nodejs/node#13730 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
kfarnung
reviewed
Jun 29, 2017
|
|
||
| static_assert( | ||
| sizeof(error_messages) / sizeof(*error_messages) == napi_status_last, | ||
| node::arraysize(error_messages) == napi_escape_called_twice + 1, |
Contributor
There was a problem hiding this comment.
There's an upstream PR to eliminate node_internal.h from node_api.h, we should probably avoid taking any further dependency on it.
Contributor
There was a problem hiding this comment.
Although taking another look it seems like there's some discussion ongoing, so we can leave this for now.
Member
Author
There was a problem hiding this comment.
Yeah, i just adopted this changes from node_api.cc.
Contributor
There was a problem hiding this comment.
Yeah, that PR was closed now and we're going a different direction. LGTM as is.
kfarnung
approved these changes
Jun 29, 2017
Contributor
kfarnung
left a comment
kfarnung
left a comment
There was a problem hiding this comment.
LGTM with minor changes.
kfarnung
approved these changes
Jun 29, 2017
Merge 3e17884 as of 2017-06-22. This is an automatically created merge. For any problems please contact @kunalspathak. PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
Removed usage of `napi_status_last` from `node_api_jsrt.cc` and replaced with `node::array` PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
jsrt napi doesn't implement `napi_open_escapable_handle_scope`. When we escape handle scope twice, we should throw, but there is no place to store the information. Hence skipping the check for now. PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
kfarnung
pushed a commit
to kfarnung/node-chakracore
that referenced
this pull request
Jul 5, 2017
Removed usage of `napi_status_last` from `node_api_jsrt.cc` and replaced with `node::array` PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
kfarnung
pushed a commit
to kfarnung/node-chakracore
that referenced
this pull request
Jul 6, 2017
jsrt napi doesn't implement `napi_open_escapable_handle_scope`. When we escape handle scope twice, we should throw, but there is no place to store the information. Hence skipping the check for now. PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
kfarnung
pushed a commit
to kfarnung/node-chakracore
that referenced
this pull request
Jul 6, 2017
Removed usage of `napi_status_last` from `node_api_jsrt.cc` and replaced with `node::array` PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
kfarnung
pushed a commit
to kfarnung/node-chakracore
that referenced
this pull request
Jul 6, 2017
jsrt napi doesn't implement `napi_open_escapable_handle_scope`. When we escape handle scope twice, we should throw, but there is no place to store the information. Hence skipping the check for now. PR-URL: nodejs#321 Reviewed-By: Kyle Farnung <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge 3e17884 as of 2017-06-22.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
core, n-api, test