Skip to content

Commit 6cb2721

Browse files
committed
PR nits
1 parent dff02db commit 6cb2721

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

fetch.bs

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

2849-
<li>
2850-
<p>Let <var>proxies</var> be the result of finding proxies for <var>url</var> in an
2851-
<a>implementation-defined</a> manner. If there are no proxies, let <var>proxies</var> be
2852-
« "<code>DIRECT</code>" ».
2853-
2854-
<p class=note>This is where non-standard technology such as
2855-
<a href="https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol">Web Proxy Auto-Discovery Protocol (WPAD)</a>
2856-
and <a href="https://en.wikipedia.org/wiki/Proxy_auto-config">proxy auto-config (PAC)</a> come
2857-
into play. The "<code>DIRECT</code>" value means to not use a proxy for this particular
2858-
<var>url</var>.
2849+
<li><p>Let <var>proxies</var> of calling <a>resolve proxies</a>.
28592850

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

@@ -2912,6 +2903,19 @@ reused across <a>connections</a> whose <a for=connection>credentials</a> are fal
29122903

29132904
<hr>
29142905

2906+
<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>" ».
2909+
2910+
<p class=note>This is where non-standard technology such as
2911+
<a href="https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol">Web Proxy Auto-Discovery Protocol (WPAD)</a>
2912+
and <a href="https://en.wikipedia.org/wiki/Proxy_auto-config">proxy auto-config (PAC)</a> come
2913+
into play. The "<code>DIRECT</code>" value means to not use a proxy for this particular
2914+
<var>url</var>.
2915+
</div>
2916+
2917+
<hr>
2918+
29152919
<div algorithm>
29162920
<p>To <dfn>create a connection</dfn>, given a <a for=/>network partition key</a> <var>key</var>,
29172921
<a for=/>origin</a> <var>origin</var>, boolean <var>credentials</var>, string <var>proxy</var>,
@@ -3023,7 +3027,7 @@ details of reused connections are not exposed and time values are coarsened.
30233027
</div>
30243028

30253029

3026-
<h3 id=preemptive-connection-operations>Preemptive connection operations</h3>
3030+
<h3 id=preemptive-connections>Preemptive connections</h3>
30273031

30283032
<div algorithm="preemmptively-obtain-a-connection">
30293033
<p>To <dfn export>preemptively obtain a connection</dfn>, given an
@@ -3066,13 +3070,11 @@ these steps:
30663070
<li><p><a>Check CSP for preemptive operation</a> with <var>environment</var> and <var>url</var>. If
30673071
that returns <b>blocked</b>, return.
30683072

3069-
<li><p>Let <var>proxies</var> be the result of finding proxies for <var>url</var> in an
3070-
<a>implementation-defined</a> manner.
3073+
<li><p>Let <var>proxies</var> be the result of calling <a>resolve proxies</a>.
30713074

30723075
<li>
3073-
<p>If <var>proxies</var> is <a for=list>empty</a>, or if <var>proxies</var>
3074-
<a for=list>contains</a> "<code>DIRECT</code>", then <a>resolve an origin</a> given <var>key</var>
3075-
and <var>url</var>'s <a for=url>origin</a>.
3076+
<p>If <var>proxies</var> <a for=list>contains</a> "<code>DIRECT</code>", then
3077+
<a>resolve an origin</a> given <var>key</var> and <var>url</var>'s <a for=url>origin</a>.
30763078

30773079
<p class=note>As the results of this algorithm can be cached, future fetches could be faster.
30783080
</ol>
@@ -3090,7 +3092,6 @@ run these steps:
30903092

30913093
<li><p>Return the result of running <a>should request be blocked by Content Security Policy?</a>
30923094
given <var>request</var>.
3093-
30943095
</ol>
30953096
</div>
30963097

@@ -8782,7 +8783,7 @@ to discuss. [[CSP]]
87828783
<a>environment settings object</a> you're operating in. Web-exposed APIs are generally defined with
87838784
Web IDL, for which every object that implements an <a>interface</a> has a
87848785
<a>relevant settings object</a> you can use. For example, a <a for=/>request</a> associated with an
8785-
{{Element}} would set the <a for=/>request</a>'s <a for=request>client</a> to the element's
8786+
<a for=/>element</a> would set the <a for=/>request</a>'s <a for=request>client</a> to the element's
87868787
<a>node document</a>'s <a>relevant settings object</a>. All features that are directly web-exposed
87878788
by JavaScript, HTML, CSS, or other {{Document}} subresources should have a
87888789
<a for=request>client</a>.

0 commit comments

Comments
 (0)