From c5d899cf9b04e8166ffb1f1a7ea2cb8cf8f5d0ca Mon Sep 17 00:00:00 2001
From: Matt Giuca <mgiuca@chromium.org>
Date: Wed, 26 Jul 2017 17:16:41 +1000
Subject: [PATCH 1/2] Navigation scope: Avoid using pathname field.

Fixes a definitional issue only (same behaviour). pathname is a field of
the URL interface, *not* the URL concept which has path as a list of
strings. This defines the same algorithm but in terms of the URL concept
instead.
---
 index.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 764aad54..5f5ae444 100644
--- a/index.html
+++ b/index.html
@@ -775,9 +775,17 @@ <h2>
         <li>Let <var>target</var> be a new URL using <var>targetURL</var> as
         input. If <var>target</var> is failure, return <code>false</code>.
         </li>
+        <li>Let <var>scopePath</var> be the elements of <var>scopes</var>'s
+        <a data-cite="!WHATWG-URL#concept-url-path">path</a>, separated by
+        U+002F (/).
+        </li>
+        <li>Let <var>targetPath</var> be the elements of <var>target</var>'s
+        <a data-cite="!WHATWG-URL#concept-url-path">path</a>, separated by
+        U+002F (/).
+        </li>
         <li>If <var>target</var> is <a>same origin</a> as <var>scope</var> and
-        <var>target</var>'s <code>pathname</code> starts with
-        <var>scope</var>'s <code>pathname</code>, return <code>true</code>.
+        <var>targetPath</var> starts with <var>scopePath</var>, return
+        <code>true</code>.
         </li>
         <li>Otherwise, return <code>false</code>.
         </li>

From 353336c45666de179bbd49550fe9b90f33c5744e Mon Sep 17 00:00:00 2001
From: Matt Giuca <mgiuca@chromium.org>
Date: Wed, 26 Jul 2017 17:23:51 +1000
Subject: [PATCH 2/2] Added a note explaining this strange behaviour.

Closes #554.
---
 index.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/index.html b/index.html
index 5f5ae444..246fe175 100644
--- a/index.html
+++ b/index.html
@@ -790,6 +790,15 @@ <h2>
         <li>Otherwise, return <code>false</code>.
         </li>
       </ol>
+      <div class="note" title="Scope is a simple string match">
+        The URL string matching in this algorithm is prefix-based rather than
+        path-structural (e.g. a target URL string
+        <code>/prefix-of/resource.html</code> will match an app with scope
+        <code>/prefix</code>, even though the path segment name is not an exact
+        match). This is intentional for consistency with <a data-cite=
+        "!SERVICE-WORKERS-1#scope-match-algorithm">Service Workers</a>. To
+        avoid unexpected behavior, use a scope ending in a <code>/</code>.
+      </div>
       <div class="issue" title="🐒 patch">
         <p>
           Enforcing the navigation scope depends on [[!HTML]]'s navigate