Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 20f452d228.
This commit is contained in:
sixcooler 2013-07-04 19:13:51 +02:00
parent 20f452d228
commit 69906b1d2e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
source/net/yacy/cora/protocol/http/ProxySettings.java
View File

@ -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;