android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-15 20:56:41 +03:00
Code Releases Activity

Don't fallback to no proxy after all configured proxies have failed.

Browse Source 
Falling back to no proxy causes problems, particularly when the proxy is
adding some value.

Closes: https://github.com/square/okhttp/issues/2525
This commit is contained in:
jwilson
2016-11-14 20:39:09 -05:00
parent 6da4d59c20
commit 2a5fb08b39
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
okhttp-tests/src/test/java/okhttp3/CallTest.java
View File

@@ -2514,7 +2514,8 @@ public final class CallTest {
// Enable a misconfigured proxy selector to guarantee that the request is retried.
client = client.newBuilder()
.proxySelector(new FakeProxySelector()
.addProxy(server2.toProxyAddress()))
.addProxy(server2.toProxyAddress())
.addProxy(Proxy.NO_PROXY))
.build();
server2.shutdown();

3
okhttp-tests/src/test/java/okhttp3/URLConnectionTest.java
View File

@@ -310,7 +310,8 @@ public final class URLConnectionTest {
// Use a misconfigured proxy to guarantee that the request is retried.
urlFactory.setClient(urlFactory.client().newBuilder()
.proxySelector(new FakeProxySelector()
.addProxy(server2.toProxyAddress()))
.addProxy(server2.toProxyAddress())
.addProxy(Proxy.NO_PROXY))
.build());
server2.shutdown();

19
okhttp-tests/src/test/java/okhttp3/internal/connection/RouteSelectorTest.java
View File

@@ -206,12 +206,7 @@ public final class RouteSelectorTest {
assertRoute(routeSelector.next(), address, proxyB, dns.address(0), proxyBPort);
dns.assertRequests(proxyBHost);
// Finally try the only IP address of the origin server.
assertTrue(routeSelector.hasNext());
dns.addresses(makeFakeAddresses(253, 1));
assertRoute(routeSelector.next(), address, NO_PROXY, dns.address(0), uriPort);
dns.assertRequests(uriHost);
// No more proxies to try.
assertFalse(routeSelector.hasNext());
}
@@ -259,11 +254,6 @@ public final class RouteSelectorTest {
assertRoute(routeSelector.next(), address, proxyA, dns.address(0), proxyAPort);
dns.assertRequests(proxyAHost);
assertTrue(routeSelector.hasNext());
dns.addresses(makeFakeAddresses(254, 1));
assertRoute(routeSelector.next(), address, NO_PROXY, dns.address(0), uriPort);
dns.assertRequests(uriHost);
assertFalse(routeSelector.hasNext());
}
@@ -285,12 +275,7 @@ public final class RouteSelectorTest {
dns.assertRequests(proxyBHost);
assertRoute(routeSelector.next(), address, proxyB, dns.address(1), proxyBPort);
// Origin
dns.addresses(makeFakeAddresses(253, 2));
assertRoute(routeSelector.next(), address, NO_PROXY, dns.address(0), uriPort);
dns.assertRequests(uriHost);
assertRoute(routeSelector.next(), address, NO_PROXY, dns.address(1), uriPort);
// No more proxies to attempt.
assertFalse(routeSelector.hasNext());
}

14
okhttp/src/main/java/okhttp3/internal/connection/RouteSelector.java
View File

@@ -28,6 +28,7 @@ import java.util.NoSuchElementException;
import okhttp3.Address;
import okhttp3.HttpUrl;
import okhttp3.Route;
import okhttp3.internal.Util;
/**
* Selects routes to connect to an origin server. Each connection requires a choice of proxy server,
@@ -111,14 +112,11 @@ public final class RouteSelector {
// If the user specifies a proxy, try that and only that.
proxies = Collections.singletonList(proxy);
} else {
// Try each of the ProxySelector choices until one connection succeeds. If none succeed
// then we'll try a direct connection below.
proxies = new ArrayList<>();
List<Proxy> selectedProxies = address.proxySelector().select(url.uri());
if (selectedProxies != null) proxies.addAll(selectedProxies);
// Finally try a direct connection. We only try it once!
proxies.removeAll(Collections.singleton(Proxy.NO_PROXY));
proxies.add(Proxy.NO_PROXY);
// Try each of the ProxySelector choices until one connection succeeds.
List<Proxy> proxiesOrNull = address.proxySelector().select(url.uri());
proxies = proxiesOrNull != null && !proxiesOrNull.isEmpty()
? Util.immutableList(proxiesOrNull)
: Util.immutableList(Proxy.NO_PROXY);
}
nextProxyIndex = 0;
}