Bug 1602832 - P6: Make sure we don't launch socket process for xpcshell http server r=dragana

Differential Revision: https://phabricator.services.mozilla.com/D76664

netwerk/base/nsIOService.cpp

@@ -456,6 +456,11 @@ nsresult nsIOService::LaunchSocketProcess() {
     return NS_OK;
   }
 
+  if (PR_GetEnv("MOZ_DISABLE_SOCKET_PROCESS")) {
+    LOG(("nsIOService skipping LaunchSocketProcess because of the env"));
+    return NS_OK;
+  }
+
   if (!Preferences::GetBool("network.process.enabled", true)) {
     LOG(("nsIOService skipping LaunchSocketProcess because of the pref"));
     return NS_OK;
@@ -508,6 +513,11 @@ bool nsIOService::UseSocketProcess(bool aCheckAgain) {
 
   sUseSocketProcessChecked = true;
   sUseSocketProcess = false;
+
+  if (PR_GetEnv("MOZ_DISABLE_SOCKET_PROCESS")) {
+    return sUseSocketProcess;
+  }
+
   if (StaticPrefs::network_process_enabled()) {
     sUseSocketProcess =
         StaticPrefs::network_http_network_access_on_socket_process_enabled();

testing/mochitest/runtests.py

@@ -501,6 +501,9 @@ class MochitestServer(object):
         # care about races in xpcshell. So disable TSan for the server.
         env["TSAN_OPTIONS"] = "report_bugs=0"
 
+        # Don't use socket process for the xpcshell server.
+        env["MOZ_DISABLE_SOCKET_PROCESS"] = "1"
+
         if mozinfo.isWin:
             env["PATH"] = env["PATH"] + ";" + str(self._xrePath)