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

session: allow user to isolate pac script and proxy bypass rules

Browse source
This commit is contained in:
Robo 2016-01-11 03:55:56 +05:30
parent 9a707b7c69
commit be50ca2653
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,15 +114,15 @@ 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))
mate::Dictionary options;
if (!ConvertFromV8(isolate, val, &options))
return false;
auto pac_url = GURL(proxy);
if (pac_url.is_valid()) {
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;
}
};