diff --git a/index.html b/index.html index a35c9cd4..fbce0e9e 100644 --- a/index.html +++ b/index.html @@ -1623,8 +1623,7 @@

Proxy

string Defines the proxy host for HTTP traffic when the proxyType is "manual". - A host and optional port for - scheme "http". + A proxy url. @@ -1640,34 +1639,47 @@

Proxy

string Defines the proxy host for encrypted TLS traffic when the proxyType is "manual". - A host and optional port for - scheme "https". + A proxy url. 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 host for SOCKS traffic when the + proxyType is "manual". + A proxy url. socksVersion number - Defines the SOCKS proxy version - when the proxyType is "manual". + Defines the SOCKS proxy version when the proxy url'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 url 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. + +

    +
  1. The host may + include credentials. +

  2. If the port is omitted and scheme has a + default port, this is the implied port. Otherwise, the port + is left undefined. + +

  3. If the scheme is omitted and the port is 443, + the scheme is implied to be "https". Otherwise, the + scheme is implied to be "http". +

+ +

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 +1732,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 url 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.