mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #4046 from deepak1556/session_proxy_patch

Browse source 
session: allow user to isolate pac script and proxy bypass rules
This commit is contained in:
Cheng Zhao 2016-01-11 21:49:15 +08:00
commit 34c9279fc5
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docs/api/session.md
View file

@ -181,15 +181,16 @@ Clears the data of web storages.
#### `ses.setProxy(config, callback)`
* `config` String
* `config` Object
* `pacScript` String - The URL associated with the PAC file.
* `proxyRules` String - Rules indicating which proxies to use.
* `callback` Function - Called when operation is done.
If `config` is a PAC url, it is used directly otherwise
`config` is parsed based on the following rules indicating which
proxies to use for the session.
When `pacScript` and `proxyRules` are provided together, the `proxyRules`
option is ignored and `pacScript` configuration is applied.
```
config = scheme-proxies[";"<scheme-proxies>]
proxyRules = scheme-proxies[";"<scheme-proxies>]
scheme-proxies = [<url-scheme>"="]<proxy-uri-list>
url-scheme = "http" | "https" | "ftp" | "socks"
proxy-uri-list = <proxy-uri>[","<proxy-uri-list>]