diff --git a/index.html b/index.html index 365e67c4..ae997f29 100644 --- a/index.html +++ b/index.html @@ -1621,10 +1621,9 @@

Proxy

httpProxy string - Defines the proxy host for HTTP traffic when + Defines the proxy configuration for HTTP traffic when the proxyType is "manual". - A host and optional port for - scheme "http". + A proxy specifier for "http". @@ -1638,36 +1637,57 @@

Proxy

sslProxy string - Defines the proxy host for encrypted TLS traffic + Defines the proxy configuration for encrypted TLS traffic when the proxyType is "manual". - A host and optional port for - scheme "https". + A proxy specifier "https". socksProxy string - Defines the proxy host for a SOCKS proxy - when the proxyType is "manual". - A host and optional port with an undefined scheme. + Defines the proxy configuration for SOCKS traffic when the + proxyType is "manual". + A proxy specifier for "socks". socksVersion number - Defines the SOCKS proxy version - when the proxyType is "manual". + Defines the SOCKS proxy version when the proxy specifier's + proxy scheme is "socks". Any integer between 0 and 255 inclusive. -

A host and optional port for a scheme is - defined as being a valid host, optionally followed by a colon - and a valid port. The host may - include credentials. If the - port is omitted and scheme has a default port, - this is the implied port. Otherwise, the port is left undefined. +

A proxy specifier for proxy scheme protocol can + be either "direct" or a string consists of an optional + proxy scheme scheme followed by the string + "://", a valid host host, and optionally a + colon followed by a valid port port. + +

The scheme can be different from protocol. + If so, it means that the protocol traffic will be proxied via + scheme. + +

    +
  1. If scheme is omitted, let scheme be null. + +

  2. If scheme is null, let scheme be + protocol. + +

  3. If scheme is "http" or "https", + the host may + include credentials. + +

  4. If the port is omitted and scheme has a + default port, then remote end should use this port. Otherwise, + the port is left undefined. +

+ +

A proxy scheme is defined as being one of the following strings: + "http", "https", "socks", + "socks4", "socks5".

A proxyType of "direct" indicates that the browser should not use a proxy at all. @@ -1720,10 +1740,10 @@

Proxy

own property for "proxyAutoconfigUrl" return an error with error code invalid argument. -
  • If proxy has an own property for - "socksProxy" and does not have an own property - for "socksVersion" return an error with error - code invalid argument. +

  • If proxy contains proxy specifier with + proxy scheme "socks" and does not have an + own property for "socksVersion", return an error + with error code invalid argument.

  • Return success with data proxy.