Skip to content

Commit ef41a25

Browse files
committed
PR nits
1 parent 7e6e995 commit ef41a25

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
@@ -2850,16 +2850,7 @@ steps:
28502850
<a>connection</a>.
28512851
</ol>
28522852

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

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

@@ -2916,6 +2907,19 @@ reused across <a>connections</a> whose <a for=connection>credentials</a> are fal
29162907

29172908
<hr>
29182909

2910+
<div algorithm>
2911+
<p>To <dfn>resolve proxies</dfn>, return the result of finding proxies for <var>url</var> in an
2912+
<a>implementation-defined</a> manner. If there are no proxies, return « "<code>DIRECT</code>" ».
2913+
2914+
<p class=note>This is where non-standard technology such as
2915+
<a href="https://en.wikipedia.org/wiki/Web_Proxy_Auto-Discovery_Protocol">Web Proxy Auto-Discovery Protocol (WPAD)</a>
2916+
and <a href="https://en.wikipedia.org/wiki/Proxy_auto-config">proxy auto-config (PAC)</a> come
2917+
into play. The "<code>DIRECT</code>" value means to not use a proxy for this particular
2918+
<var>url</var>.
2919+
</div>
2920+
2921+
<hr>
2922+
29192923
<div algorithm>
29202924
<p>To <dfn>create a connection</dfn>, given a <a for=/>network partition key</a> <var>key</var>,
29212925
<a for=/>origin</a> <var>origin</var>, boolean <var>credentials</var>, string <var>proxy</var>,
@@ -3027,7 +3031,7 @@ details of reused connections are not exposed and time values are coarsened.
30273031
</div>
30283032

30293033

3030-
<h3 id=preemptive-connection-operations>Preemptive connection operations</h3>
3034+
<h3 id=preemptive-connections>Preemptive connections</h3>
30313035

30323036
<div algorithm="preemmptively-obtain-a-connection">
30333037
<p>To <dfn export>preemptively obtain a connection</dfn>, given an
@@ -3070,13 +3074,11 @@ these steps:
30703074
<li><p><a>Check CSP for preemptive operation</a> with <var>environment</var> and <var>url</var>. If
30713075
that returns <b>blocked</b>, return.
30723076

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

30763079
<li>
3077-
<p>If <var>proxies</var> is <a for=list>empty</a>, or if <var>proxies</var>
3078-
<a for=list>contains</a> "<code>DIRECT</code>", then <a>resolve an origin</a> given <var>key</var>
3079-
and <var>url</var>'s <a for=url>origin</a>.
3080+
<p>If <var>proxies</var> <a for=list>contains</a> "<code>DIRECT</code>", then
3081+
<a>resolve an origin</a> given <var>key</var> and <var>url</var>'s <a for=url>origin</a>.
30803082

30813083
<p class=note>As the results of this algorithm can be cached, future fetches could be faster.
30823084
</ol>
@@ -3094,7 +3096,6 @@ run these steps:
30943096

30953097
<li><p>Return the result of running <a>should request be blocked by Content Security Policy?</a>
30963098
given <var>request</var>.
3097-
30983099
</ol>
30993100
</div>
31003101

@@ -8792,7 +8793,7 @@ to discuss. [[CSP]]
87928793
<a>environment settings object</a> you're operating in. Web-exposed APIs are generally defined with
87938794
Web IDL, for which every object that implements an <a>interface</a> has a
87948795
<a>relevant settings object</a> you can use. For example, a <a for=/>request</a> associated with an
8795-
{{Element}} would set the <a for=/>request</a>'s <a for=request>client</a> to the element's
8796+
<a for=/>element</a> would set the <a for=/>request</a>'s <a for=request>client</a> to the element's
87968797
<a>node document</a>'s <a>relevant settings object</a>. All features that are directly web-exposed
87978798
by JavaScript, HTML, CSS, or other {{Document}} subresources should have a
87988799
<a for=request>client</a>.

0 commit comments

Comments
 (0)