Bug 31303: Do not launch tor in browser toolbox

810ba7e9 · Alex Catarineu · 784dbc8b · 810ba7e9
Commit 810ba7e9 authored Sep 18, 2019 by Alex Catarineu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

src/modules/tl-util.jsm src/modules/tl-util.jsm +3 -0

No files found.
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -333,10 +333,13 @@ let TorLauncherUtil =  // Public
    const kPrefStartTor = "extensions.torlauncher.start_tor";
    try
    {
+      const kBrowserToolboxPort = "MOZ_BROWSER_TOOLBOX_PORT";
      const kEnvSkipLaunch = "TOR_SKIP_LAUNCH";

      var env = Cc["@mozilla.org/process/environment;1"]
                  .getService(Ci.nsIEnvironment);
+      if (env.exists(kBrowserToolboxPort))
+        return false;
      if (env.exists(kEnvSkipLaunch))
        return ("1" != env.get(kEnvSkipLaunch));
    } catch(e) {}