From 0798b0f17c2aa028f4ced601d31fb5ec65347a96 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Tue, 25 May 2021 15:00:01 +0200
Subject: [PATCH] Editorial: make WebSocket use obtain a connection

On closer inspection "obtain a WebSocket connection" does not appear to do anything that "obtain a connection" does not do, especially now the latter has a dedicated argument.

This brings "obtain a connection" closer to the goal of covering all web platform connections and a being a policy-enforcement point for them.
---
 fetch.bs | 50 ++++++++------------------------------------------
 1 file changed, 8 insertions(+), 42 deletions(-)

diff --git a/fetch.bs b/fetch.bs
index 709127dd4..55e0b8971 100644
--- a/fetch.bs
+++ b/fetch.bs
@@ -1571,8 +1571,7 @@ to not have to set <a for=/>request</a>'s <a for=request>referrer</a>.
   <dd>This is a special mode used only when <a>navigating</a> between documents.
 
   <dt>"<code>websocket</code>"
-  <dd>This is a special mode used only when <a lt="establish a WebSocket connection">establishing
-  a WebSocket connection</a>.
+  <dd>This is a special mode used for the WebSocket API.
  </dl>
 
  <p>Even though the default <a for=/>request</a> <a for=request>mode</a> is "<code>no-cors</code>",
@@ -5074,21 +5073,14 @@ optional boolean <var>forceNewConnection</var> (default false), run these steps:
  <li><p>Let <var>networkPartitionKey</var> be the result of
  <a for=request>determining the network partition key</a> given <var>request</var>.
 
- <li>
-  <p>Switch on <var>request</var>'s <a for=request>mode</a>:
-
-  <dl>
-   <dt>"<code>websocket</code>"
-   <dd><p>Let <var>connection</var> be the result of
-   <a lt="obtain a WebSocket connection">obtaining a WebSocket connection</a>, given
-   <var>request</var>'s <a for=request>current URL</a>.
+ <li><p>Let <var>dedicatedConnection</var> be true if <var>request</var>'s <a for=request>mode</a>
+ is "<code>websocket</code>"; otherwise false.
 
-   <dt>Otherwise
-   <dd><p>Let <var>connection</var> be the result of
-   <a lt="obtain a connection">obtaining a connection</a>, given <var>networkPartitionKey</var>,
-   <var>request</var>'s <a for=request>current URL</a>'s <a for=url>origin</a>,
-   <var>includeCredentials</var>, and <var>forceNewConnection</var>.
-  </dl>
+ <li><p>Let <var>connection</var> be the result of
+ <a lt="obtain a connection">obtaining a connection</a>, given <var>networkPartitionKey</var>,
+ <var>request</var>'s <a for=request>current URL</a>'s <a for=url>origin</a>,
+ <var>includeCredentials</var>, <var>forceNewConnection</var>, and with
+ <a for="obtain a connection"><i>dedicated</i></a> set to <var>dedicatedConnection</var>.
 
  <li>Set <var>timingInfo</var>'s <a for="fetch timing info">final connection timing info</a> to the
  result of calling <a>clamp and coarsen connection timing info</a> with <var>connection</var>'s
@@ -7425,32 +7417,6 @@ fetch("https://www.example.com/")
 </div>
 
 
-<h3 id=websocket-connections>Connections</h3>
-
-<p>To <dfn id=concept-websocket-connection-obtain>obtain a WebSocket connection</dfn>, given a
-<var>url</var>, run these steps:
-
-<ol>
- <li><p>Let <var ignore>host</var> be <var>url</var>'s <a for=url>host</a>.
-
- <li><p>Let <var ignore>port</var> be <var>url</var>'s <a for=url>port</a>.
-
- <li><p>Let <var ignore>secure</var> be false, if <var>url</var>'s <a for=url>scheme</a> is
- "<code>http</code>", and true otherwise.
-
- <li><p>Follow the requirements stated in step 2 to 5, inclusive, of the first set of steps in
- <a href=http://tools.ietf.org/html/rfc6455#section-4.1>section 4.1</a> of The WebSocket Protocol
- to establish a <a lt="obtain a WebSocket connection">WebSocket connection</a>.
- [[!WSP]]
-
- <li><p>If that established a connection, return it, and return failure otherwise.
-</ol>
-
-<p class=note>Although structured a little differently, carrying different properties, and
-therefore not shareable, a WebSocket connection is very close to identical to an "ordinary"
-<a>connection</a>.
-
-
 <h3 id=websocket-opening-handshake>Opening handshake</h3>
 
 <p>To <dfn id=concept-websocket-establish>establish a WebSocket connection</dfn>, given a