Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1177909 - Part 1: support perferred proxy type while using system proxy setting; r=bagder

Browse Source 
MozReview-Commit-ID: 7C5pSxO1d2j

--HG--
extra : rebase_source : b22b533fd83ad377128781f44fe1fc0c66f5adc1
This commit is contained in:
Liang-Heng Chen 2017-06-12 11:41:14 +08:00
parent 3167c35036
commit a3cc60dae5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/base/nsProtocolProxyService.cpp
View File

@ -1980,6 +1980,14 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel,
uri->GetScheme(scheme);
uri->GetPort(&port);
if (flags & RESOLVE_PREFER_SOCKS_PROXY) {
LOG(("Ignoring RESOLVE_PREFER_SOCKS_PROXY for system proxy setting\n"));
} else if (flags & RESOLVE_PREFER_HTTPS_PROXY) {
scheme.AssignLiteral("https");
} else if (flags & RESOLVE_IGNORE_URI_SCHEME) {
scheme.AssignLiteral("http");
}
// now try the system proxy settings for this particular url
if (NS_SUCCEEDED(mSystemProxySettings->
GetProxyForURI(spec, scheme, host, port,