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

(v7.x backport) url: handle windows drive letter in the file state #12880

Closed
wants to merge 1 commit into from
Closed

(v7.x backport) url: handle windows drive letter in the file state #12880

wants to merge 1 commit into from
+105 −4

Conversation

watilde
Copy link
Member

@watilde watilde commented May 7, 2017

Backport of #12808 to 7.x:

url: handle windows drive letter in the file state

C| should not satisfy the condition to not copy the base's path. It also synchronises WPT url test data to verify the update in upstream.

Checklist
Affected core subsystem(s)

url

@watilde
url: handle windows drive letter in the file state
85629af 
`C|` should not satisfy the condition to not copy
the base's path. It also synchronises WPT url test data
to verify the update in upstream.

PR-URL: nodejs#12808
Refs: whatwg/url#305
Refs: web-platform-tests/wpt#5754
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Reviewed-By: Timothy Gu <[email protected]>
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. dont-land-on-v4.x whatwg-url Issues and PRs related to the WHATWG URL implementation. labels May 7, 2017
@watilde
Copy link
Member Author

watilde commented May 7, 2017

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

TimothyGu
TimothyGu approved these changes May 7, 2017
View reviewed changes
Copy link
Member

@TimothyGu TimothyGu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. However, if there was not any merge conflict, the v7.x maintainer should have been able to handle the cherry-picking.

@watilde
Copy link
Member Author

watilde commented May 10, 2017

Thanks for reviwing! It has a conflict in the test file. Will put this into v7 staging later.

@watilde
Copy link
Member Author

watilde commented May 12, 2017

Landed in 3e80fc8.

@watilde watilde closed this May 12, 2017
@watilde watilde deleted the backport-12808 branch May 12, 2017 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TimothyGu TimothyGu TimothyGu approved these changes

@jasnell jasnell jasnell approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. whatwg-url Issues and PRs related to the WHATWG URL implementation.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@watilde @jasnell @TimothyGu @nodejs-github-bot