Skip to content
Permalink
Browse files

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.

PR-URL: #12808
Refs: whatwg/url#305
Refs: web-platform-tests/wpt#5754
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
  • Loading branch information...
watilde authored and TimothyGu committed May 3, 2017
1 parent 0258aed commit 943dd5f9ed1857d9f04cdca77ed5139d69918173
Showing with 105 additions and 4 deletions.
  1. +5 −3 src/node_url.cc
  2. +100 −1 test/fixtures/url-tests.js
@@ -1169,6 +1169,7 @@ void URL::Parse(const char* input,

while (p <= end) {
const char ch = p < end ? p[0] : kEOL;
const size_t remaining = end == p ? 0 : (end - p - 1);

if (IsASCIITabOrNewline(ch)) {
if (state == kAuthority) {
@@ -1653,9 +1654,10 @@ void URL::Parse(const char* input,
state = kFragment;
break;
default:
if ((!IsWindowsDriveLetter(ch, p[1]) ||
end - p == 1 ||
(p[2] != '/' &&
if ((remaining == 0 ||
!IsWindowsDriveLetter(ch, p[1]) ||
(remaining >= 2 &&
p[2] != '/' &&
p[2] != '\\' &&
p[2] != '?' &&
p[2] != '#'))) {
@@ -1,7 +1,7 @@
'use strict';

/* WPT Refs:
https://github.com/w3c/web-platform-tests/blob/3afae94/url/urltestdata.json
https://github.com/w3c/web-platform-tests/blob/28541bb/url/urltestdata.json
License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
*/
module.exports =
@@ -5430,6 +5430,105 @@ module.exports =
"search": "?chai",
"hash": ""
},
"# Windows drive letter handling with the 'file:' base URL",
{
"input": "C|",
"base": "file://host/dir/file",
"href": "file:///C:",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/C:",
"search": "",
"hash": ""
},
{
"input": "C|#",
"base": "file://host/dir/file",
"href": "file:///C:#",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/C:",
"search": "",
"hash": ""
},
{
"input": "C|?",
"base": "file://host/dir/file",
"href": "file:///C:?",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/C:",
"search": "",
"hash": ""
},
{
"input": "C|/",
"base": "file://host/dir/file",
"href": "file:///C:/",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/C:/",
"search": "",
"hash": ""
},
{
"input": "C|\\",
"base": "file://host/dir/file",
"href": "file:///C:/",
"protocol": "file:",
"username": "",
"password": "",
"host": "",
"hostname": "",
"port": "",
"pathname": "/C:/",
"search": "",
"hash": ""
},
{
"input": "C",
"base": "file://host/dir/file",
"href": "file://host/dir/C",
"protocol": "file:",
"username": "",
"password": "",
"host": "host",
"hostname": "host",
"port": "",
"pathname": "/dir/C",
"search": "",
"hash": ""
},
{
"input": "C|a",
"base": "file://host/dir/file",
"href": "file://host/dir/C|a",
"protocol": "file:",
"username": "",
"password": "",
"host": "host",
"hostname": "host",
"port": "",
"pathname": "/dir/C|a",
"search": "",
"hash": ""
},
"# Windows drive letter quirk with not empty host",
{
"input": "file://example.net/C:/",

0 comments on commit 943dd5f

Please sign in to comment.
You can’t perform that action at this time.