corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1601871 - unix: Fallback to http_proxy or https_proxy for ws and wss loads r=necko-reviewers,kershaw

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D234090
This commit is contained in:
Valentin Gosu
2025-01-15 08:57:23 +00:00
parent 4b8c5aa8e3
commit 67bec9e7e4
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
View File

@@ -144,24 +144,31 @@ static void SetProxyResultDirect(nsACString& aResult) {
aResult.AssignLiteral("DIRECT");
}
static const char* GetEnvRetryUppercase(const nsCString& aEnv) {
nsAutoCString env(aEnv);
const char* proxyVal = PR_GetEnv(env.get());
if (proxyVal) {
return proxyVal;
}
ToUpperCase(env);
proxyVal = PR_GetEnv(env.get());
return proxyVal;
}
static nsresult GetProxyFromEnvironment(const nsACString& aScheme,
const nsACString& aHost, int32_t aPort,
nsACString& aResult) {
nsAutoCString envVar;
envVar.Append(aScheme);
envVar.AppendLiteral("_proxy");
const char* proxyVal = PR_GetEnv(envVar.get());
if (!proxyVal) {
// try uppercase name too
ToUpperCase(envVar);
proxyVal = PR_GetEnv(envVar.get());
const char* proxyVal = GetEnvRetryUppercase(envVar);
if (!proxyVal && aScheme == "ws") {
proxyVal = GetEnvRetryUppercase("http_proxy"_ns);
} else if (!proxyVal && aScheme == "wss") {
proxyVal = GetEnvRetryUppercase("https_proxy"_ns);
}
if (!proxyVal) {
proxyVal = PR_GetEnv("all_proxy");
if (!proxyVal) {
// try uppercase name too
proxyVal = PR_GetEnv("ALL_PROXY");
}
proxyVal = GetEnvRetryUppercase("all_proxy"_ns);
if (!proxyVal) {
// Return failure so that the caller can detect the failure and
// fall back to other proxy detection (e.g., WPAD)
@@ -169,11 +176,7 @@ static nsresult GetProxyFromEnvironment(const nsACString& aScheme,
}
}
const char* noProxyVal = PR_GetEnv("no_proxy");
if (!noProxyVal) {
// try uppercase name too
noProxyVal = PR_GetEnv("NO_PROXY");
}
const char* noProxyVal = GetEnvRetryUppercase("no_proxy"_ns);
if (noProxyVal && IsInNoProxyList(aHost, aPort, noProxyVal)) {
SetProxyResultDirect(aResult);
return NS_OK;