summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java')
-rw-r--r--src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
index 6641aff..dd062cd 100644
--- a/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
+++ b/src/main/java/com/btr/proxy/search/browser/ie/IEProxySearchStrategy.java
@@ -165,7 +165,15 @@ public class IEProxySearchStrategy implements ProxySearchStrategy {
private void addFallbackSelector(Properties settings, ProtocolDispatchSelector ps) {
String proxy = settings.getProperty("default");
if (proxy != null) {
- ps.setFallbackSelector(ProxyUtil.parseProxySettings(proxy));
+ Proxy defaultProxy = ProxyUtil.parseProxyString(proxy, Proxy.Type.HTTP, 0);
+ if (defaultProxy.type() == Proxy.Type.SOCKS) {
+ ps.setSelector("socket", new FixedProxySelector(defaultProxy));
+ return;
+ }
+ FixedProxySelector fp = new FixedProxySelector(defaultProxy);
+ ps.setSelector("http", fp);
+ ps.setSelector("https", fp);
+ ps.setSelector("ftp", fp);
}
}
@@ -180,8 +188,14 @@ public class IEProxySearchStrategy implements ProxySearchStrategy {
private void addSelectorForProtocol(Properties settings, String protocol, ProtocolDispatchSelector ps) {
String proxy = settings.getProperty(protocol);
if (proxy != null) {
- Proxy.Type fb = protocol.startsWith("socks") ? Proxy.Type.SOCKS : Proxy.Type.HTTP;
- ProxySelector protocolSelector = ProxyUtil.parseProxySettings(proxy, fb, 0);
+ Proxy.Type type;
+ if (protocol.startsWith("socks")) {
+ type = Proxy.Type.SOCKS;
+ protocol = "socket";
+ } else {
+ type = Proxy.Type.HTTP;
+ }
+ ProxySelector protocolSelector = ProxyUtil.parseProxySettings(proxy, type, 0);
ps.setSelector(protocol, protocolSelector);
}
}