Skip to content

Commit b22e68f

Browse files
default proxy protocol to the protocol to proxy
1 parent b0a959b commit b22e68f

File tree

1 file changed

+34
-17
lines changed

1 file changed

+34
-17
lines changed

index.html

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ <h3>Proxy</h3>
16231623
<td>string
16241624
<td>Defines the proxy <a>host</a> for HTTP traffic when
16251625
the <a><code>proxyType</code></a> is "<code>manual</code>".
1626-
<td>A <a>proxy url</a>.
1626+
<td>A <a>proxy url</a> for "<code>http</code>".
16271627
</tr>
16281628

16291629
<tr>
@@ -1639,15 +1639,15 @@ <h3>Proxy</h3>
16391639
<td>string
16401640
<td>Defines the proxy <a>host</a> for encrypted TLS traffic
16411641
when the <a><code>proxyType</code></a> is "<code>manual</code>".
1642-
<td>A <a>proxy url</a>.
1642+
<td>A <a>proxy url</a> "<code>https</code>".
16431643
</tr>
16441644

16451645
<tr>
16461646
<td><code>socksProxy</code>
16471647
<td>string
16481648
<td>Defines the proxy <a>host</a> for SOCKS traffic when the
16491649
<a><code>proxyType</code></a> is "<code>manual</code>".
1650-
<td>A <a>proxy url</a>.
1650+
<td>A <a>proxy url</a> for "<code>socks</code>".
16511651
</tr>
16521652

16531653
<tr>
@@ -1660,21 +1660,38 @@ <h3>Proxy</h3>
16601660

16611661
</table>
16621662

1663-
<p>A <dfn>proxy url</dfn> can be either "<code>direct</code>" or a string
1664-
consists of an optional <a>proxy scheme</a> <var>scheme</var> followed by the
1665-
string "<code>://</code>", a valid <a>host</a> <var>host</var>, and optionally
1666-
a colon followed by a valid <a>port</a> <var>port</var>.
1663+
<p>A <dfn>proxy url</dfn> for <a>proxy scheme</a> <var>protocol</var> can be
1664+
either "<code>direct</code>" or a string consists of an optional
1665+
<a>proxy scheme</a> <var>scheme</var> followed by the string
1666+
"<code>://</code>", a valid <a>host</a> <var>host</var>, and optionally a
1667+
colon followed by a valid <a>port</a> <var>port</var>.
16671668

1668-
<ol>
1669-
<li><p>The <var>host</var> may
1670-
<a data-lt="includes credentials">include credentials</a>.
1671-
<li><p>If the <var>port</var> is omitted and <var>scheme</var> has a
1672-
<a>default port</a>, this is the implied port. Otherwise, the <var>port</var>
1673-
is left undefined.
1674-
1675-
<li><p>If the <var>scheme</var> is omitted and the <var>port</var> is 443,
1676-
the <var>scheme</var> is implied to be "<code>https</code>". Otherwise, the
1677-
<var>scheme</var> is implied to be "<code>http</code>".
1669+
<p class=note>There <var>scheme</var> can be different from
1670+
<var>protocol</var>. If so it means that the <var>protocol</var> traffic will
1671+
be proxied via <var>scheme</var>.
1672+
1673+
<ol>
1674+
<li><p>If <var>scheme</var> is omitted, let <var>scheme</var> be null.
1675+
1676+
<li><p>If <var>scheme</var> is null and <var>port</var> is <code>80</code>,
1677+
let <var>scheme</var> be "<code>http</code>".
1678+
1679+
<li><p>If <var>scheme</var> is null and <var>port</var> is <code>443</code>,
1680+
let <var>scheme</var> be "<code>https</code>".
1681+
1682+
<li><p>If <var>scheme</var> is null and <var>port</var> is <code>1080</code>,
1683+
let <var>scheme</var> be "<code>socks</code>".
1684+
1685+
<li><p>If <var>scheme</var> is null, let <var>scheme</var> be
1686+
<var>protocol</var>.
1687+
1688+
<li><p>If <var>scheme</var> is "<code>http</code>" or "<code>https</code>",
1689+
the <var>host</var> may
1690+
<a data-lt="includes credentials">include credentials</a>.
1691+
1692+
<li><p>If the <var>port</var> is omitted and <var>scheme</var> has a
1693+
<a>default port</a>, this is the implied port. Otherwise, the <var>port</var>
1694+
is left undefined.
16781695
</ol>
16791696

16801697
<p>A <dfn>proxy scheme</dfn> is defined as being one of the following strings:

0 commit comments

Comments
 (0)