url: Needs to ignore repeated slashes in file URL

watilde · Feb 5, 2017 · 247f960 · 247f960
1 parent 8b04bc9
commit 247f960
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/node_url.cc b/src/node_url.cc
@@ -731,13 +731,15 @@ namespace url {
             if (has_state_override)
               goto done;
             buffer.clear();
-            if (url.scheme == "file:") {
-              state = kFile;
-            } else if (special &&
+            if (special &&
                        has_base &&
                        DOES_HAVE_SCHEME(base) &&
                        url.scheme == base.scheme) {
-              state = kSpecialRelativeOrAuthority;
+              if (url.scheme == "file:") {
+                state = kFile;
+              } else {
+                state = kSpecialRelativeOrAuthority;
+              }
             } else if (special) {
               state = kSpecialAuthoritySlashes;
             } else if (p[1] == '/') {
@@ -950,7 +952,11 @@ namespace url {
           break;
         case kSpecialAuthorityIgnoreSlashes:
           if (ch != '/' && ch != '\\') {
-            state = kAuthority;
+            if (url.scheme == "file:") {
+              state = kFile;
+            } else {
+              state = kAuthority;
+            }
             continue;
           }
           break;

diff --git a/test/fixtures/url-tests-additional.js b/test/fixtures/url-tests-additional.js
@@ -83,5 +83,9 @@ module.exports = [
     'url': 'tag:joe@example.org,2001:foo/bar',
     'protocol': 'tag:',
     'pathname': 'joe@example.org,2001:foo/bar'
+  },
+  {
+    'url': 'file://////foo/bar',
+    'href': 'file:///foo/bar'
   }
 ];