Revert "do not use remote proxy if not switched on - regardless of the proto"

This reverts commit 20f452d228.
pull/1/head
sixcooler 12 years ago
parent 20f452d228
commit 69906b1d2e

1
.gitignore vendored

@ -12,4 +12,3 @@ RELEASE/
lib/yacy-cora.jar lib/yacy-cora.jar
/DATA.bkp /DATA.bkp
/DATA.1 /DATA.1
/gen

@ -85,7 +85,7 @@ public final class ProxySettings {
*/ */
public static boolean useForHost(final String host, Protocol protocol) { public static boolean useForHost(final String host, Protocol protocol) {
assert protocol != null; assert protocol != null;
if (!use) return false; if (protocol == Protocol.HTTP && !use) return false;
if (protocol == Protocol.HTTPS && !use4ssl) return false; if (protocol == Protocol.HTTPS && !use4ssl) return false;
if (protocol == Protocol.YACY && !use4YaCy) return false; if (protocol == Protocol.YACY && !use4YaCy) return false;
if (allowProxy.containsKey(host)) return true; if (allowProxy.containsKey(host)) return true;

Loading…
Cancel
Save