url: trim leading slashes of file URL paths #12203

watilde · 2017-04-04T10:41:53Z

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

thefourtheye · 2017-04-04T10:45:30Z

test/fixtures/url-tests.js

+    "search": "",
+    "hash": ""
+  },
+  // {


Is this commented text necessary?

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.

node/test/fixtures/url-setter-tests.js

Lines 373 to 380 in 843b7e6

// {

// "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.

thefourtheye · 2017-04-04T10:46:55Z

src/node_url.cc

+                (ch == kEOL ||
+                 ch == '?' ||
+                 ch == '#')) {
+              while (url->path.size() > 1 && url->path[0].length() == 0) {


Did you mean > 0 here?

The updated spec says greater than 1 instead of > 0:
https://github.com/whatwg/url/blob/2f4b7f74533398c41f4316157f027a33a627caf9/url.bs#L2070

watilde · 2017-04-05T06:12:41Z

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

watilde · 2017-04-05T07:40:00Z

cc @nodejs/url

TimothyGu

Almost there.

TimothyGu · 2017-04-06T02:06:14Z

src/node_url.cc

              url->flags |= URL_FLAGS_HAS_PATH;
-              url->path.push_back(base->path[0]);
+              if (NORMALIZED_WINDOWS_DRIVE_LETTER(base->path[0])) {


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

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

Updates :)

TimothyGu · 2017-04-06T02:06:35Z

src/node_url.cc

-              url->path.push_back(base->path[0]);
+              if (NORMALIZED_WINDOWS_DRIVE_LETTER(base->path[0])) {
+                url->path.push_back(base->path[0]);
+              } else {


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

watilde · 2017-04-07T06:18:07Z

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

joyeecheung · 2017-04-08T06:39:23Z

test/fixtures/url-setter-tests.js

@@ -1620,6 +1620,33 @@ module.exports =
                "href": "sc://example.net/%23",
                "pathname": "/%23"
            }
+        },
+        {
+            "comment": "File URLs and (back)slashes",


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.

updated it to 3eff1bd

joyeecheung · 2017-04-08T06:42:52Z

test/fixtures/url-tests.js

@@ -5110,6 +5110,246 @@ module.exports =
    "search": "?test",
    "hash": "#x"
  },
+  "# File URLs and many (back)slashes",


Ditto, although this file is missing https://github.com/w3c/web-platform-tests/blob/3eff1bd564a0085347d31d80fbee13aaa2e3c2ca/url/urltestdata.json#L5380-L5451 ?

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

It should trim the slashes after the colon into three for file URL. Refs: web-platform-tests/wpt#5195 Fixes: nodejs#11188

watilde · 2017-04-08T08:02:11Z

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

watilde · 2017-04-09T19:12:26Z

The windows-fanned failure looks unrelated.

refack · 2017-04-10T03:51:48Z

The windows-fanned failure looks unrelated.

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

refack · 2017-04-10T03:54:27Z

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

watilde · 2017-04-10T05:50:44Z

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

watilde · 2017-04-10T16:58:30Z

Landed in b470a85. Thanks!

It should trim the slashes after the colon into three for file URL. PR-URL: #12203 Refs: web-platform-tests/wpt#5195 Fixes: #11188 Reviewed-By: Timothy Gu <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>

italoacasas · 2017-04-10T22:19:49Z

cc @watilde

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 Apr 4, 2017

thefourtheye reviewed Apr 4, 2017

View reviewed changes

TimothyGu suggested changes Apr 6, 2017

View reviewed changes

watilde force-pushed the feature/file-slash-2 branch from 3209da9 to 56e52d5 Compare April 7, 2017 06:09

TimothyGu approved these changes Apr 7, 2017

View reviewed changes

joyeecheung reviewed Apr 8, 2017

View reviewed changes

watilde force-pushed the feature/file-slash-2 branch 2 times, most recently from 5720d56 to 50f48b6 Compare April 8, 2017 07:52

url: trim leading slashes of file URL paths

5d0f60d

It should trim the slashes after the colon into three for file URL. Refs: web-platform-tests/wpt#5195 Fixes: nodejs#11188

watilde force-pushed the feature/file-slash-2 branch from 50f48b6 to 5d0f60d Compare April 8, 2017 07:56

joyeecheung approved these changes Apr 10, 2017

View reviewed changes

watilde closed this Apr 10, 2017

watilde deleted the feature/file-slash-2 branch April 10, 2017 16:58

italoacasas added the backport-to-v7.x label Apr 10, 2017

TimothyGu mentioned this pull request Apr 19, 2017

(v7.x backport) url: updates to the WHATWG URL parser #12507

Merged

4 tasks

TimothyGu added backported-to-v7.x and removed backport-requested-v7.x labels Apr 27, 2017

jasnell mentioned this pull request May 11, 2017

8.0.0 Release Proposal #12220

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

url: trim leading slashes of file URL paths #12203

url: trim leading slashes of file URL paths #12203

watilde commented Apr 4, 2017 •

edited by TimothyGu

Loading

thefourtheye Apr 4, 2017

watilde Apr 4, 2017

thefourtheye Apr 4, 2017

watilde Apr 4, 2017

watilde commented Apr 5, 2017

watilde commented Apr 5, 2017

TimothyGu left a comment

TimothyGu Apr 6, 2017

watilde Apr 7, 2017

TimothyGu Apr 6, 2017

watilde commented Apr 7, 2017

joyeecheung Apr 8, 2017

watilde Apr 8, 2017

joyeecheung Apr 8, 2017

watilde Apr 8, 2017 •

edited

Loading

watilde commented Apr 8, 2017

watilde commented Apr 9, 2017

refack commented Apr 10, 2017

refack commented Apr 10, 2017

watilde commented Apr 10, 2017

watilde commented Apr 10, 2017

italoacasas commented Apr 10, 2017

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

url: trim leading slashes of file URL paths #12203

url: trim leading slashes of file URL paths #12203

Conversation

watilde commented Apr 4, 2017 • edited by TimothyGu Loading

Checklist

Affected core subsystem(s)

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

watilde commented Apr 5, 2017

watilde commented Apr 5, 2017

TimothyGu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

watilde commented Apr 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

watilde Apr 8, 2017 • edited Loading

Choose a reason for hiding this comment

watilde commented Apr 8, 2017

watilde commented Apr 9, 2017

refack commented Apr 10, 2017

refack commented Apr 10, 2017

watilde commented Apr 10, 2017

watilde commented Apr 10, 2017

italoacasas commented Apr 10, 2017

watilde commented Apr 4, 2017 •

edited by TimothyGu

Loading

watilde Apr 8, 2017 •

edited

Loading