Merge pull request #2333 from eladyn/proxy_proxyDNS_fix

enable proxyDNS only for supported proxies (SOCKS4/5)
mozilla · Apr 25, 2022 · d4e9502 · d4e9502
2 parents 26457f4 + 0b869a1
commit d4e9502
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
@@ -197,12 +197,17 @@ window.assignManager = {
       return {};
     }
 
+    // proxyDNS only works for SOCKS proxies
+    if (["socks", "socks4"].includes(result.proxy.type)) {
+      result.proxy.proxyDNS = true;
+    }
+
     if (!result.proxy.mozProxyEnabled) {
-      return { ...result.proxy, proxyDNS: true };
+      return result.proxy;
     }
 
     // Let's add the isolation key.
-    return [{ ...result.proxy, connectionIsolationKey: "" + MozillaVPN_Background.isolationKey, proxyDNS: true }];
+    return [{ ...result.proxy, connectionIsolationKey: "" + MozillaVPN_Background.isolationKey }];
   },
 
   // Before a request is handled by the browser we decide if we should