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

maintain api compatibility

Browse source
This commit is contained in:
Robo 2016-01-11 12:24:01 +05:30
parent be50ca2653
commit 8557cd223c
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
atom/browser/api/atom_api_session.cc
View file

@ -115,14 +115,27 @@ struct Converter<net::ProxyConfig> {
v8::Local<v8::Value> val, v8::Local<v8::Value> val,
net::ProxyConfig* out) { net::ProxyConfig* out) {
mate::Dictionary options; mate::Dictionary options;
if (!ConvertFromV8(isolate, val, &options)) if (!ConvertFromV8(isolate, val, &options)) {
return false; // Fallback to previous api (https://git.io/vuhjj).
std::string proxy;
if (!ConvertFromV8(isolate, val, &proxy))
return false;
auto pac_url = GURL(proxy);
if (pac_url.is_valid()) {
out->set_pac_url(pac_url);
} else {
out->proxy_rules().ParseFromString(proxy);
}
return true;
}
GURL pac_url; GURL pac_url;
std::string rules; std::string rules;
if (options.Get("pacScript", &pac_url)) if (options.Get("pacScript", &pac_url)) {
out->set_pac_url(pac_url); out->set_pac_url(pac_url);
else if (options.Get("proxyRules", &rules)) } else if (options.Get("proxyRules", &rules)) {
out->proxy_rules().ParseFromString(rules); out->proxy_rules().ParseFromString(rules);
}
return true; return true;
} }
}; };

3
docs/api/session.md
View file

@ -186,6 +186,9 @@ Clears the data of web storages.
* `proxyRules` String - Rules indicating which proxies to use. * `proxyRules` String - Rules indicating which proxies to use.
* `callback` Function - Called when operation is done. * `callback` Function - Called when operation is done.
When `pacScript` and `proxyRules` are provided together, the `proxyRules`
option is ignored and `pacScript` configuration is applied.
``` ```
proxyRules = scheme-proxies[";"<scheme-proxies>] proxyRules = scheme-proxies[";"<scheme-proxies>]
scheme-proxies = [<url-scheme>"="]<proxy-uri-list> scheme-proxies = [<url-scheme>"="]<proxy-uri-list>