Merge pull request #2333 from eladyn/proxy_proxyDNS_fix

enable proxyDNS only for supported proxies (SOCKS4/5)
2022-04-25 19:52:48 +02:00
parent 26457f4c3f 0b869a139a
commit d4e9502e94
1 changed files with 7 additions and 2 deletions
@@ -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