Skip to content

Conversation

@watilde
Copy link
Contributor

@watildewatilde commented Apr 4, 2017

It should trim the slashes after the colon into three for file URL.

Resources:

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

url

@nodejs-github-botnodejs-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 Apr 4, 2017
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this commented text necessary?

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

This additional is to follow the spec/test updates(web-platform-tests/wpt#5195), and we're still having some remaining unfollowed updates of the spec. When we follow them that can fix this test cases, we can take the comment out.

e.g.

//{
// "href": "file://test/",
// "new_value": "test",
// "expected":{
// "href": "file://test/",
// "username": ""
// }
// }

I will work on it later, but I think it's better to separate a patch from this PR since the referral link can be different.

src/node_url.cc Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you mean > 0 here?

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

@watilde
Copy link
ContributorAuthor

@watilde
Copy link
ContributorAuthor

cc @nodejs/url

Copy link
Member

@TimothyGuTimothyGu left a comment

Choose a reason for hiding this comment

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

Almost there.

src/node_url.cc Outdated
Copy link
Member

Choose a reason for hiding this comment

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

The url->flags |= URL_FLAGS_HAS_PATH; should go into this branch.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

Thanks! The flags seem to be there around passing a value to the property.

Updates :)

src/node_url.cc Outdated
Copy link
Member

Choose a reason for hiding this comment

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

And this branch needs a url->flags |= URL_FLAGS_HAS_HOST;

@watildewatildeforce-pushed the feature/file-slash-2 branch from 3209da9 to 56e52d5CompareApril 7, 2017 06:09
@watilde
Copy link
ContributorAuthor

Copy link
Member

Choose a reason for hiding this comment

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

Can you update the hash of the link in the comment at the top of this file

/* WPT Refs: https://github.com/w3c/web-platform-tests/blob/e48dd15/url/setters_tests.json License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html */ 

This should be 3eff1bd now.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

updated it to 3eff1bd

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
ContributorAuthor

@watildewatildeApr 8, 2017

Choose a reason for hiding this comment

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

Done synchronising them all by hands, and the lines were added as a result! thanks.

@watildewatildeforce-pushed the feature/file-slash-2 branch 2 times, most recently from 5720d56 to 50f48b6CompareApril 8, 2017 07:52
It should trim the slashes after the colon into three for file URL. Refs: web-platform-tests/wpt#5195Fixes: nodejs#11188
@watildewatildeforce-pushed the feature/file-slash-2 branch from 50f48b6 to 5d0f60dCompareApril 8, 2017 07:56
@watilde
Copy link
ContributorAuthor

@watilde
Copy link
ContributorAuthor

The windows-fanned failure looks unrelated.

@refack
Copy link
Contributor

The windows-fanned failure looks unrelated.

Yep failed test on windows because of #12283, CI can be considered green.

@refack
Copy link
Contributor

Another one for good luck
CI: https://ci.nodejs.org/job/node-test-pull-request/7295/

@watilde
Copy link
ContributorAuthor

@refack Thanks for following up! I'm going to merge this tonight :)

@watilde
Copy link
ContributorAuthor

Landed in b470a85. Thanks!

@watildewatilde closed this Apr 10, 2017
@watildewatilde deleted the feature/file-slash-2 branch April 10, 2017 16:58
watilde added a commit that referenced this pull request Apr 10, 2017
It should trim the slashes after the colon into three for file URL. PR-URL: #12203 Refs: web-platform-tests/wpt#5195Fixes: #11188 Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
@italoacasas
Copy link

cc @watilde

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c++Issues and PRs that require attention from people who are familiar with C++.whatwg-urlIssues and PRs related to the WHATWG URL implementation.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@watilde@refack@italoacasas@thefourtheye@TimothyGu@joyeecheung@nodejs-github-bot