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

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

@ -114,14 +114,27 @@ struct Converter<net::ProxyConfig> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
net::ProxyConfig* out) {
std::string proxy;
if (!ConvertFromV8(isolate, val, &proxy))
return false;
auto pac_url = GURL(proxy);
if (pac_url.is_valid()) {
mate::Dictionary options;
if (!ConvertFromV8(isolate, val, &options)) {
// 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;
std::string rules;
if (options.Get("pacScript", &pac_url)) {
out->set_pac_url(pac_url);
} else {
out->proxy_rules().ParseFromString(proxy);
} else if (options.Get("proxyRules", &rules)) {
out->proxy_rules().ParseFromString(rules);
}
return true;
}