Merge remote-tracking branch 'upstream/release' into iceweasel_release

adonais · Jun 24, 2022 · a700d59 · a700d59
2 parents d792c59 + 3d6efae
commit a700d59
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.hgtags b/.hgtags
@@ -3704,3 +3704,4 @@ ac17d3e21f82ce34b2b9f09f8a15b270cf41e91c FIREFOX_RELEASE_102_BASE
 910517036c968689e4268026543119fcf6628049 FIREFOX_RELEASE_102_BASE
 555c7ef72f772d24616bbb6c1cec6cd756b51685 FIREFOX_RELEASE_101_END
 f1604ed27bc0e3853c5c120b321ba13226bc071c FIREFOX_102_0_BUILD1
+b6b2b8930fdfb037e4a743d0ac722a1f2b1b1447 FIREFOX_102_0_BUILD2
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -1120,7 +1120,10 @@ pref("network.protocol-handler.external.iehistory", false);
 pref("network.protocol-handler.external.ierss", false);
 pref("network.protocol-handler.external.mk", false);
 pref("network.protocol-handler.external.ms-help", false);
+pref("network.protocol-handler.external.ms-msdt", false);
 pref("network.protocol-handler.external.res", false);
+pref("network.protocol-handler.external.search", false);
+pref("network.protocol-handler.external.search-ms", false);
 pref("network.protocol-handler.external.shell", false);
 pref("network.protocol-handler.external.vnd.ms.radio", false);
 #ifdef XP_MACOSX

diff --git a/python/mozbuild/mozbuild/gn_processor.py b/python/mozbuild/mozbuild/gn_processor.py
@@ -4,7 +4,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from collections import defaultdict
+from collections import defaultdict, deque
 from copy import deepcopy
 import glob
 import json
@@ -141,10 +141,14 @@ def terminate_condition(self):
 
 
 def find_deps(all_targets, target):
-    all_deps = set([target])
-    for dep in all_targets[target]["deps"]:
-        if dep not in all_deps:
-            all_deps |= find_deps(all_targets, dep)
+    all_deps = set()
+    queue = deque([target])
+    while queue:
+        item = queue.popleft()
+        all_deps.add(item)
+        for dep in all_targets[item]["deps"]:
+            if dep not in all_deps:
+                queue.append(dep)
     return all_deps