Skip to content

Commit c005718

Browse files
committed
A few editorial nits
1 parent 6d5759c commit c005718

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

fetch.bs

+12-11
Original file line numberDiff line numberDiff line change
@@ -2846,7 +2846,7 @@ steps:
28462846
<a>connection</a>.
28472847
</ol>
28482848

2849-
<li><p>Let <var>proxies</var> of calling <a>resolve proxies</a>.
2849+
<li><p>Let <var>proxies</var> of calling <a>resolve proxies</a> given <var>url</var>.
28502850

28512851
<li><p>Let <var>timingInfo</var> be a new <a for=/>connection timing info</a>.
28522852

@@ -2904,8 +2904,9 @@ reused across <a>connections</a> whose <a for=connection>credentials</a> are fal
29042904
<hr>
29052905

29062906
<div algorithm>
2907-
<p>To <dfn>resolve proxies</dfn>, return the result of finding proxies for <var>url</var> in an
2908-
<a>implementation-defined</a> manner. If there are no proxies, return « "<code>DIRECT</code>" ».
2907+
<p>To <dfn>resolve proxies</dfn> given a <a for=/>URL</a> <var>url</var>, return the result of
2908+
finding proxies for <var>url</var> in an <a>implementation-defined</a> manner. If there are no
2909+
proxies, return « "<code>DIRECT</code>" ».
29092910

29102911
<p class=note>This is where non-standard technology such as
29112912
<a href="https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol">Web Proxy Auto-Discovery Protocol (WPAD)</a>
@@ -3029,7 +3030,7 @@ details of reused connections are not exposed and time values are coarsened.
30293030

30303031
<h3 id=preemptive-connections>Preemptive connections</h3>
30313032

3032-
<div algorithm="preemmptively-obtain-a-connection">
3033+
<div algorithm>
30333034
<p>To <dfn export>preemptively obtain a connection</dfn>, given an
30343035
<a>environment settings object</a> <var>environment</var>, a <a for=/>URL</a> <var>url</var>, and a
30353036
boolean <var>credentials</var>, run these steps:
@@ -3039,9 +3040,9 @@ boolean <var>credentials</var>, run these steps:
30393040
<var>environment</var>.
30403041

30413042
<li>
3042-
<p><a>Check CSP for preemptive operation</a> with <var>environment</var> and <var>url</var>. If
3043-
that returns <b>allowed</b>, <a>obtain a connection</a> with <var>key</var>, <var>url</var> and
3044-
<var>credentials</var>.
3043+
<p>Run <a>Should connection be allowed by Content Security Policy?</a> with
3044+
<var>environment</var> and <var>url</var>. If that returns <b>allowed</b>,
3045+
<a>obtain a connection</a> with <var>key</var>, <var>url</var>, and <var>credentials</var>.
30453046

30463047
<p class=note>This connection is obtained but not used directly. It will remain in the
30473048
<a>connection pool</a> for subsequent use.
@@ -3058,7 +3059,7 @@ boolean <var>credentials</var>, run these steps:
30583059
</ol>
30593060
</div>
30603061

3061-
<div algorithm="preemmptively-resolve-an-origin">
3062+
<div>
30623063
<p>To <dfn export>preemptively resolve an origin</dfn>, given an
30633064
<a>environment settings object</a> <var>environment</var> and a <a for=/>URL</a> <var>url</var>, run
30643065
these steps:
@@ -3067,8 +3068,8 @@ these steps:
30673068
<li><p>Let <var>key</var> be the result of <a for=/>determining the network partition key</a> given
30683069
<var>environment</var>.
30693070

3070-
<li><p><a>Check CSP for preemptive operation</a> with <var>environment</var> and <var>url</var>. If
3071-
that returns <b>blocked</b>, return.
3071+
<li>Run <p><a>Should connection be allowed by Content Security Policy?</a> with
3072+
<var>environment</var> and <var>url</var>. If that returns <b>blocked</b>, return.
30723073

30733074
<li><p>Let <var>proxies</var> be the result of calling <a>resolve proxies</a>.
30743075

@@ -3081,7 +3082,7 @@ these steps:
30813082
</div>
30823083

30833084
<div algorithm="check-preemptive-operation-csp">
3084-
<p>To <dfn>check CSP for preemptive operation</dfn>, given an
3085+
<p>To <dfn>Should connection be allowed by Content Security Policy?</dfn>, given an
30853086
<a>environment settings object</a> <var>environment</var>, and a <a for=/>URL</a> <var>url</var>,
30863087
run these steps:
30873088

0 commit comments

Comments
 (0)