Don't register plugins if the MOZILLA_DISABLE_PLUGINS environment variable is set

Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Don-t-register-plugins-if-the-MOZILLA_DISABLE_PLUGIN.patch

diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index ad37e0001e6c3d84fed17666931ff1158a615398..e5833d75b13695c24d16e1cbad3ebf5b7ad92f08 100644 (file)
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -290,6 +290,10 @@ nsPluginHost::nsPluginHost()
     Preferences::AddStrongObserver(this, "plugin.disable");
   }
 
+  const char *env = PR_GetEnv("MOZILLA_DISABLE_PLUGINS");
+  if (env && env[0])
+    mPluginsDisabled = PR_TRUE;
+
   nsCOMPtr<nsIObserverService> obsService =
       mozilla::services::GetObserverService();
   if (obsService) {