From f3201783519e511e88e98386301a8f5430bf0972 Mon Sep 17 00:00:00 2001
From: Daijiro Wachi <daijiro.wachi@gmail.com>
Date: Wed, 8 Feb 2017 18:54:13 +0100
Subject: [PATCH] Repeated slashes should be ignored in file scheme

Repeated slashes should be ignored in not only the http scheme, but
also the file scheme as well.

Tests: https://github.com/w3c/web-platform-tests/pull/4762

Fixes: https://github.com/whatwg/url/issues/232
---
 url.bs | 59 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/url.bs b/url.bs
index b54475fa..736f505b 100644
--- a/url.bs
+++ b/url.bs
@@ -1358,21 +1358,22 @@ string <var>input</var>, optionally with a <a>base URL</a> <var>base</var>, opti
        <li><p>If <var>state override</var> is given, terminate this algorithm.
 
        <li>
-        <p>If <var>url</var>'s <a for=url>scheme</a> is "<code>file</code>", run these
-        subsubsteps:
-
+        <p>Otherwise, if <var>url</var> <a>is special</a>, <var>base</var> is non-null, and
+        <var>base</var>'s <a for=url>scheme</a> is equal to <var>url</var>'s
+        <a for=url>scheme</a>, run these subsubsteps:</p>
         <ol>
-         <li><p>If <a>remaining</a> does not start with "<code>//</code>",
-         <a>syntax violation</a>.
-
-         <li><p>Set <var>state</var> to <a>file state</a>.
+         <li>
+          <p>If <var>url</var>'s <a for=url>scheme</a> is "<code>file</code>", run these
+           subsubsteps:</p>
+           <ol>
+            <li><p>If <a>remaining</a> does not start with "<code>//</code>",
+             <a>syntax violation</a>.</p></li>
+            <li><p>Set <var>state</var> to <a>file state</a>.</p></li>
+          </ol>
+         <li>
+          <p>Otherwise, set <var>state</var> to <a>special relative or authority state</a>.</p>
+         </li>
         </ol>
-
-       <li>
-        <p>Otherwise, if <var>url</var> <a>is special</a>, <var>base</var> is non-null, and
-        <var>base</var>'s <a for=url>scheme</a> is equal to <var>url</var>'s <a for=url>scheme</a>,
-        set <var>state</var> to <a>special relative or authority state</a>.
-
         <p class="note no-backref">This means that <var>base</var>'s
         <a for=url>cannot-be-a-base-URL flag</a> is unset.
 
@@ -1561,11 +1562,33 @@ string <var>input</var>, optionally with a <a>base URL</a> <var>base</var>, opti
 
    <dt><dfn>special authority ignore slashes state</dfn>
    <dd>
-    <p>If <a>c</a> is neither "<code>/</code>" nor "<code>\</code>", set <var>state</var>
-    to <a>authority state</a>, and decrease <var>pointer</var> by one.
-
-    <p>Otherwise, <a>syntax violation</a>.
-
+    <ol>
+     <li>
+      <p>If <a>c</a> is neither "<code>/</code>" nor "<code>\</code>", run these substeps:
+      <ol>
+       <li>
+        <p>If <var>url</var>'s <a for=url>scheme</a> is "<code>file</code>", run these
+        subsubsteps:
+        <ol>
+         <li>
+          <p>If <a>remaining</a> does not start with "<code>//</code>",
+          <a>syntax violation</a>.</p>
+         </li>
+         <li>
+          <p>Set <var>state</var> to <a>file state</a>,
+          and decrease <var>pointer</var> by one.</p>
+         </li>
+        </ol>
+       <li>
+        <p>Otherwise, set <var>state</var>
+        to <a>authority state</a>, and decrease <var>pointer</var> by one.</p>
+       </li>
+      </ol>
+     <li>
+      <p>Otherwise, <a>syntax violation</a>.</p>
+     </li>
+    </ol>
+   </dd>
    <dt><dfn>authority state</dfn>
    <dd>
     <ol>