mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
Backed out changeset 6e0936ea7f4a (bug 1648189) on dev's request, for causing mda failures on beta sims. CLOSED TREE
This commit is contained in:
parent
e75d5918a7
commit
e603449118
@ -527,7 +527,7 @@ nsresult nsIOService::LaunchSocketProcess() {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!UseSocketProcess(true)) {
|
||||
if (!Preferences::GetBool("network.process.enabled", true)) {
|
||||
LOG(("nsIOService skipping LaunchSocketProcess because of the pref"));
|
||||
return NS_OK;
|
||||
}
|
||||
@ -585,14 +585,13 @@ bool nsIOService::UseSocketProcess(bool aCheckAgain) {
|
||||
return sUseSocketProcess;
|
||||
}
|
||||
|
||||
if (PR_GetEnv("MOZ_FORCE_USE_SOCKET_PROCESS")) {
|
||||
sUseSocketProcess = true;
|
||||
return sUseSocketProcess;
|
||||
}
|
||||
|
||||
if (StaticPrefs::network_process_enabled()) {
|
||||
sUseSocketProcess =
|
||||
StaticPrefs::network_http_network_access_on_socket_process_enabled();
|
||||
if (PR_GetEnv("MOZ_FORCE_USE_SOCKET_PROCESS")) {
|
||||
sUseSocketProcess = true;
|
||||
} else {
|
||||
sUseSocketProcess =
|
||||
StaticPrefs::network_http_network_access_on_socket_process_enabled();
|
||||
}
|
||||
}
|
||||
return sUseSocketProcess;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user