From 1d26245024b2b3a67e658978313f60930bdf97c7 Mon Sep 17 00:00:00 2001
From: Jake Archibald <jaffathecake@gmail.com>
Date: Thu, 7 Sep 2017 13:20:55 +0100
Subject: [PATCH 1/6] Removing "stop timeout flag"

---
 xhr.bs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/xhr.bs b/xhr.bs
index 607131a..5309149 100644
--- a/xhr.bs
+++ b/xhr.bs
@@ -252,9 +252,6 @@ interface XMLHttpRequest : XMLHttpRequestEventTarget {
 <p>An {{XMLHttpRequest}} object has an associated
 <dfn id=send-flag><code>send()</code> flag</dfn>. Unless stated otherwise it is unset.
 
-<p>An {{XMLHttpRequest}} object has an associated <dfn>stop timeout flag</dfn>.
-Unless stated otherwise it is unset.
-
 
 <h3 id=constructors>Constructors</h3>
 
@@ -526,7 +523,7 @@ methods, when invoked, must run these steps:
   <p>Set variables associated with the object as follows:
 
   <ul>
-   <li><p>Unset the <a><code>send()</code> flag</a>, <a>stop timeout flag</a>, and
+   <li><p>Unset the <a><code>send()</code> flag</a>, and
    <a>upload listener flag</a>.
    <li><p>Set <a>request method</a> to <var>method</var>.
    <li><p>Set <a>request URL</a> to <var>parsedURL</var>.
@@ -955,9 +952,6 @@ method must run these steps:
     run these subsubsteps:
 
     <ol>
-     <li><p>If the <a>stop timeout flag</a> is unset, set the
-     <a>stop timeout flag</a>.
-
      <li><p>Set <a>response</a> to <var>response</var>.
 
      <li><p><a>Handle errors</a> for <var>response</var>.

From f4b596cb855d8be14342f8256c4f4491ccb8ce4e Mon Sep 17 00:00:00 2001
From: Jake Archibald <jaffathecake@gmail.com>
Date: Thu, 7 Sep 2017 13:21:43 +0100
Subject: [PATCH 2/6] Removing reliance on termination reasons

---
 xhr.bs | 63 +++++++++++++++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/xhr.bs b/xhr.bs
index 5309149..2e638f2 100644
--- a/xhr.bs
+++ b/xhr.bs
@@ -394,16 +394,17 @@ the row where the value in the cell in the first column is <a>context object</a>
 <dfn id=author-request-headers>author request headers</dfn>,
 <dfn>request body</dfn>,
 <dfn>synchronous flag</dfn>,
-<dfn id=upload-complete-flag>upload complete flag</dfn>, and
-<dfn>upload listener flag</dfn>.
+<dfn id=upload-complete-flag>upload complete flag</dfn>,
+<dfn>upload listener flag</dfn>, and
+<dfn>timed out flag</dfn>.
 
 <p>The <a>author request headers</a> is an initially empty
 <a for=/>header list</a>.
 
 <p>The <a>request body</a> is initially null.
 
-<p>The <a>synchronous flag</a>, <a>upload complete flag</a>, and
-<a>upload listener flag</a> are initially unset.
+<p>The <a>synchronous flag</a>, <a>upload complete flag</a>, <a>upload listener flag</a> and
+<a>timed out flag</a> are initially unset.
 
 <p class="note no-backref" id=event-listeners-and-preflight>Registering one or more event listeners
 on an {{XMLHttpRequestUpload}} object will result in a <a>CORS-preflight request</a>. (That is
@@ -415,7 +416,7 @@ turn causes the <a>use-CORS-preflight flag</a> to be set.)
 <p>To <dfn>terminate the request</dfn>,
 <a for=fetch>terminate</a> the
 <a for=/>fetch</a> algorithm operated by the
-{{XMLHttpRequest}} object with reason <i>fatal</i>.
+{{XMLHttpRequest}} object.
 
 
 
@@ -850,6 +851,8 @@ method must run these steps:
 
  <li><p>Unset the <a>upload complete flag</a>.
 
+ <li><p>Unset the <a>timed out flag</a>.
+
  <li><p>If <var>req</var>'s
  <a for=request>body</a> is null,
  set the <a>upload complete flag</a>.
@@ -890,8 +893,8 @@ method must run these steps:
        <li><p>while {{XMLHttpRequest/timeout!!attribute}} attribute value is not zero.
       </ol>
 
-     <li><p>If <var>req</var>'s <a for=request>done flag</a> is unset, then
-     <a for=fetch>terminate</a> <a for=/>fetching</a> with reason <i>timeout</i>.
+     <li><p>If <var>req</var>'s <a for=request>done flag</a> is unset, then set the
+     <a>timed out flag</a>, and <a for=fetch>terminate</a> <a for=/>fetching</a>.
     </ol>
 
     <p>To <a>process request body</a> for
@@ -1036,12 +1039,9 @@ method must run these steps:
     <p>Let <var>response</var> be the result of
     <a for=/>fetching</a> <var>req</var>.
 
-    <p>If the {{XMLHttpRequest/timeout!!attribute}} attribute value is not
-    zero, <a for=fetch>terminate</a> this
-    <a for=/>fetch</a> if it has not returned
-    within the amount of milliseconds from the
-    {{XMLHttpRequest/timeout!!attribute}} attribute value with reason
-    <i>timeout</i>.
+    <p>If the {{XMLHttpRequest/timeout!!attribute}} attribute value is not zero, set the
+    <a>timed out flag</a> and <a for=fetch>terminate</a> <a for=/>fetching</a> if it has not
+    returned within the amount of milliseconds from the {{XMLHttpRequest/timeout!!attribute}}.
 
    <li><p>If <var>response</var>'s
    <a for=response>body</a> is null,
@@ -1116,33 +1116,24 @@ method must run these steps:
  <a>request error steps</a> for event <a event><code>error</code></a> and
  exception <code>NetworkError</code>.
 
- <li>
-  <p>Otherwise, if <var>response</var> has a
-  <a>termination reason</a>:
+ <li><p>If the <a>timed out flag</a> is set, then run the <a>request error steps</a> for event
+ <a event><code>timeout</code></a> and exception <code>TimeoutError</code>.
 
-  <dl class=switch>
-   <dt><i>end-user abort</i>
-   <dd><p>Run the <a>request error steps</a> for event
-   <a event><code>abort</code></a> and exception
-   <code>AbortError</code>.
+ <li>
+  <p>Otherwise, if <var>response</var>'s <a for=response>body</a>'s <a for=body>stream</a> has
+  <a for=ReadableStream>errored</a>, then:
 
-   <dt><i>fatal</i>
-   <dd>
-    <ol>
-     <li><p>Set <a>state</a> to
-     <i>done</i>.
+  <ol>
+   <li><p>Set <a>state</a> to <i>done</i>.
 
-     <li><p>Unset the <a><code>send()</code> flag</a>.
+   <li><p>Unset the <a><code>send()</code> flag</a>.
 
-     <li><p>Set <a>response</a> to a
-     <a>network error</a>.
-    </ol>
+   <li><p>Set <a>response</a> to a <a>network error</a>.
+  </ol>
 
-   <dt><i>timeout</i>
-   <dd><p>Run the <a>request error steps</a> for event
-   <a event><code>timeout</code></a> and exception
-   <code>TimeoutError</code>.
-  </dl>
+ <li><p>Otherwise, if <var>response</var>'s <a for=response>aborted flag</a> is set, then run the
+ <a>request error steps</a> for event <a event><code>abort</code></a> and exception
+ <code>AbortError</code>.
 </ol>
 
 <p>The <dfn>request error steps</dfn> for event <var>event</var> and optionally an
@@ -1200,7 +1191,7 @@ exception <var>exception</var> are:
 when invoked, must run these steps:
 
 <ol>
- <li><p><a>Terminate the request</a>.
+ <li><p><a for=fetch lt=terminated>Terminate</a> the ongoing fetch with the <i>aborted</i> flag set.
 
  <li><p>If <a>state</a> is either
  <i>opened</i> with the <a><code>send()</code> flag</a> set,

From 0fa3236a1797392a21b68f07891cc82023078e4d Mon Sep 17 00:00:00 2001
From: Jake Archibald <jaffathecake@gmail.com>
Date: Thu, 7 Sep 2017 14:03:25 +0100
Subject: [PATCH 3/6] Inlining terminate fetch

---
 xhr.bs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/xhr.bs b/xhr.bs
index 2e638f2..0c3724c 100644
--- a/xhr.bs
+++ b/xhr.bs
@@ -283,7 +283,8 @@ registered whose <b>type</b> is one of
 <!-- No need to mention upload event listeners as they happen during /opened/. -->
 
 <p>If an {{XMLHttpRequest}} object is garbage collected while its
-connection is still open, the user agent must <a>terminate the request</a>.
+connection is still open, the user agent must <a for=fetch lt=terminated>terminate</a> the ongoing
+fetch operated by the {{XMLHttpRequest}} object.
 
 
 <h3 id=event-handlers>Event handlers</h3>
@@ -413,13 +414,6 @@ turn causes the <a>use-CORS-preflight flag</a> to be set.)
 
 <hr>
 
-<p>To <dfn>terminate the request</dfn>,
-<a for=fetch>terminate</a> the
-<a for=/>fetch</a> algorithm operated by the
-{{XMLHttpRequest}} object.
-
-
-
 <h4 id=the-open()-method>The <code>open()</code> method</h4>
 
 <dl class=domintro>
@@ -515,7 +509,8 @@ methods, when invoked, must run these steps:
  <code>InvalidAccessError</code> exception.
 
  <li>
-  <p><a>Terminate the request</a>.
+  <p><a for=fetch lt=terminated>Terminate</a> the ongoing fetch operated by the
+  {{XMLHttpRequest}} object.
 
   <p class=note>A <a for=/>fetch</a> can be
   ongoing at this point.

From da2245906ad6877fd6f755fe4fcf74ac13e4d8f7 Mon Sep 17 00:00:00 2001
From: Jake Archibald <jaffathecake@gmail.com>
Date: Thu, 7 Sep 2017 14:03:34 +0100
Subject: [PATCH 4/6] Commas

---
 xhr.bs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/xhr.bs b/xhr.bs
index 0c3724c..547162c 100644
--- a/xhr.bs
+++ b/xhr.bs
@@ -519,8 +519,7 @@ methods, when invoked, must run these steps:
   <p>Set variables associated with the object as follows:
 
   <ul>
-   <li><p>Unset the <a><code>send()</code> flag</a>, and
-   <a>upload listener flag</a>.
+   <li><p>Unset the <a><code>send()</code> flag</a> and <a>upload listener flag</a>.
    <li><p>Set <a>request method</a> to <var>method</var>.
    <li><p>Set <a>request URL</a> to <var>parsedURL</var>.
    <li><p>Set the <a>synchronous flag</a>, if <var>async</var> is false, and unset
@@ -889,7 +888,7 @@ method must run these steps:
       </ol>
 
      <li><p>If <var>req</var>'s <a for=request>done flag</a> is unset, then set the
-     <a>timed out flag</a>, and <a for=fetch>terminate</a> <a for=/>fetching</a>.
+     <a>timed out flag</a> and <a for=fetch>terminate</a> <a for=/>fetching</a>.
     </ol>
 
     <p>To <a>process request body</a> for

From 154d57afbc33b805682080b2985572f214d614b5 Mon Sep 17 00:00:00 2001
From: Jake Archibald <jaffathecake@gmail.com>
Date: Thu, 7 Sep 2017 14:03:56 +0100
Subject: [PATCH 5/6] then set

---
 xhr.bs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xhr.bs b/xhr.bs
index 547162c..9c4cf0c 100644
--- a/xhr.bs
+++ b/xhr.bs
@@ -1033,7 +1033,7 @@ method must run these steps:
     <p>Let <var>response</var> be the result of
     <a for=/>fetching</a> <var>req</var>.
 
-    <p>If the {{XMLHttpRequest/timeout!!attribute}} attribute value is not zero, set the
+    <p>If the {{XMLHttpRequest/timeout!!attribute}} attribute value is not zero, then set the
     <a>timed out flag</a> and <a for=fetch>terminate</a> <a for=/>fetching</a> if it has not
     returned within the amount of milliseconds from the {{XMLHttpRequest/timeout!!attribute}}.
 

From bbe3e774da79581bcfee2ed5098c23b3bf28b1a1 Mon Sep 17 00:00:00 2001
From: Jake Archibald <jaffathecake@gmail.com>
Date: Fri, 8 Sep 2017 12:32:09 +0100
Subject: [PATCH 6/6] is errored

---
 xhr.bs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xhr.bs b/xhr.bs
index 9c4cf0c..6bf26e7 100644
--- a/xhr.bs
+++ b/xhr.bs
@@ -1114,7 +1114,7 @@ method must run these steps:
  <a event><code>timeout</code></a> and exception <code>TimeoutError</code>.
 
  <li>
-  <p>Otherwise, if <var>response</var>'s <a for=response>body</a>'s <a for=body>stream</a> has
+  <p>Otherwise, if <var>response</var>'s <a for=response>body</a>'s <a for=body>stream</a> is
   <a for=ReadableStream>errored</a>, then:
 
   <ol>