Spec update: trim leading slashes of file URL paths

Follows whatwg/url#278.
jsdom · Mar 29, 2017 · 38e32cc · 38e32cc
1 parent 084105d
commit 38e32cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/scripts/get-latest-platform-tests.js b/scripts/get-latest-platform-tests.js
@@ -14,7 +14,7 @@ const request = require("request");
 // 1. Go to https://github.com/w3c/web-platform-tests/tree/master/url
 // 2. Press "y" on your keyboard to get a permalink
 // 3. Copy the commit hash
-const commitHash = "e48dd15f848ea7758960fa2dad352253572339c9";
+const commitHash = "0c50fd6f360ebcd1b43f197182c9434de34b8c56";
 
 const sourceURL = `https://raw.githubusercontent.com/w3c/web-platform-tests/${commitHash}/url/urltestdata.json`;
 const setterSourceURL = `https://raw.githubusercontent.com/w3c/web-platform-tests/${commitHash}/url/setters_tests.json`;

diff --git a/src/url-state-machine.js b/src/url-state-machine.js
@@ -963,8 +963,10 @@ URLStateMachine.prototype["parse file slash"] = function parseFileSlash(c) {
     this.state = "file host";
   } else {
     if (this.base !== null && this.base.scheme === "file") {
-      if (this.base.path.length > 0 && isNormalizedWindowsDriveLetterString(this.base.path[0])) {
+      if (isNormalizedWindowsDriveLetterString(this.base.path[0])) {
         this.url.path.push(this.base.path[0]);
+      } else {
+        this.url.host = this.base.host;
       }
     }
     this.state = "path";
@@ -1062,6 +1064,12 @@ URLStateMachine.prototype["parse path"] = function parsePath(c) {
       this.url.path.push(this.buffer);
     }
     this.buffer = "";
+    if (this.url.scheme === "file" && (c === undefined || c === p("?") || c === p("#"))) {
+      while (this.url.path.length > 1 && this.url.path[0] === "") {
+        this.parseError = true;
+        this.url.path.shift();
+      }
+    }
     if (c === p("?")) {
       this.url.query = "";
       this.state = "query";