diff --git a/webdriver-spec.html b/webdriver-spec.html index 3bb725ab5..2d595641e 100644 --- a/webdriver-spec.html +++ b/webdriver-spec.html @@ -549,8 +549,11 @@
pac
",
- "noproxy
",
+ "direct
",
"autodetect
",
"system
",
or "manual
".
@@ -1909,54 +1912,32 @@ proxyType
is equal to "pac
".
- ftpProxy
ftpProxy
to the host
- and ftpProxyPort
to the port
- when the proxyType
- is equal to "manual
".
- example.com
or example.com:1234
)
- ftpProxyPort
- proxyType
- is equal to "manual
".
- If ftpProxyPort
is defined in ftpProxy
- and from this property,
- return error with error code invalid argument.
- proxyType
is "manual
".
+ httpProxy
httpProxy
to the host
- and httpProxyPort
to the port
- when the proxyType
- is equal to "manual
".
- proxyType
is "manual
".
+ httpProxyPort
- proxyType
is "manual
".
- If httpProxyPort
is defined in httpProxy
- and from this property,
- return error with error code invalid argument.
- noProxy
+ proxyType
is "manual
".
+ proxyType
is "manual
".
- If a URL is passed through this property,
- set sslProxy
to the host
- and sslProxyPort
to the port.
- sslProxyPort
- proxyType
is "manual
".
- If sslProxyPort
is defined in sslProxy
- and from this property,
- return error with error code invalid argument.
- proxyType
is "manual
".
- If a URL is passed through this property,
- set socksProxy
to the host
- and socksProxyPort
to the port.
- socksProxyPort
- proxyType
is "manual
".
- If socksProxyPort
is defined in socksProxy
- and from this property,
- return error with error code invalid argument.
- socksUsername
- proxyType
is "manual
".
- socksPassword
- proxyType
is "manual
",
- and is not returned with capabilities to the local end.
- A host and optional port is defined as being a + valid host, optionally followed by a colon + and port. The host may + include credentials. + +
A proxyType
of "direct
" indicates
+ that the browser should not use a proxy at all.
+
+
A proxyType
of "system
" indicates
+ that the browser should use the various proxies configured for the
+ underlying Operating System.
+
+
A proxyType
of "autodetect
"
+ indicates that the proxy to use should be detected in an
+ implementation-specific way.
+
The remote end steps to deserialize as a proxy argument parameter are: @@ -2059,6 +2011,10 @@
Set a property key to value on proxy. + +
If proxy does not have an own property for
+ "proxyType
" return an error with error
+ code invalid argument.
A proxy configuration object is a