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

Merge pull request #70 from brightray/proxy-server

Browse source 
Add --proxy-server and --no-proxy-server switch
This commit is contained in:
Cheng Zhao 2014-08-20 11:55:08 +08:00
commit bbb3702543
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
brightray/browser/url_request_context_getter.cc
View file

@ -61,7 +61,15 @@ namespace {
// These mappings apply to the endpoint host in a net::URLRequest (the TCP // These mappings apply to the endpoint host in a net::URLRequest (the TCP
// connect and host resolver in a direct connection, and the CONNECT in an http // connect and host resolver in a direct connection, and the CONNECT in an http
// proxy connection, and the endpoint host in a SOCKS proxy connection). // proxy connection, and the endpoint host in a SOCKS proxy connection).
const char kHostRules[] = "host-rules"; const char kHostRules[] = "host-rules";
// Don't use a proxy server, always make direct connections. Overrides any
// other proxy server flags that are passed.
const char kNoProxyServer[] = "no-proxy-server";
// Uses a specified proxy server, overrides system settings. This switch only
// affects HTTP and HTTPS requests.
const char kProxyServer[] = "proxy-server";
} // namespace } // namespace
@ -132,14 +140,20 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
} }
net::DhcpProxyScriptFetcherFactory dhcp_factory; net::DhcpProxyScriptFetcherFactory dhcp_factory;
storage_->set_proxy_service( if (command_line.HasSwitch(kNoProxyServer))
net::CreateProxyServiceUsingV8ProxyResolver( storage_->set_proxy_service(net::ProxyService::CreateDirect());
proxy_config_service_.release(), else if (command_line.HasSwitch(kProxyServer))
new net::ProxyScriptFetcherImpl(url_request_context_.get()), storage_->set_proxy_service(net::ProxyService::CreateFixed(
dhcp_factory.Create(url_request_context_.get()), command_line.GetSwitchValueASCII(kProxyServer)));
host_resolver.get(), else
NULL, storage_->set_proxy_service(
url_request_context_->network_delegate())); net::CreateProxyServiceUsingV8ProxyResolver(
proxy_config_service_.release(),
new net::ProxyScriptFetcherImpl(url_request_context_.get()),
dhcp_factory.Create(url_request_context_.get()),
host_resolver.get(),
NULL,
url_request_context_->network_delegate()));
storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
storage_->set_transport_security_state(new net::TransportSecurityState); storage_->set_transport_security_state(new net::TransportSecurityState);