diff options
| author | 2013-10-31 18:43:53 +0000 | |
|---|---|---|
| committer | 2013-10-31 18:43:53 +0000 | |
| commit | 86f5a1499bc681ffae2b9f2300c9a62653d511dc (patch) | |
| tree | 6e8c0a15670e95b3b7d0fdb88a0cf81aa5595307 | |
| parent | a0bc738f46f62ba1a02e956a8c262323ab4ab75c (diff) | |
| parent | 179d6e8e2067c380d3c1f7a1a26877b81a9240cb (diff) | |
Merge "Change PacProxySelector to return unresolved addr" into klp-dev
| -rw-r--r-- | core/java/android/net/PacProxySelector.java | 2 | ||||
| -rw-r--r-- | packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/net/PacProxySelector.java b/core/java/android/net/PacProxySelector.java index b674324197ed..8a2c2b6c675f 100644 --- a/core/java/android/net/PacProxySelector.java +++ b/core/java/android/net/PacProxySelector.java @@ -97,7 +97,7 @@ public class PacProxySelector extends ProxySelector { } catch (Exception e) { port = 8080; } - ret.add(new Proxy(Type.HTTP, new InetSocketAddress(host, port))); + ret.add(new Proxy(Type.HTTP, InetSocketAddress.createUnresolved(host, port))); } } if (ret.size() == 0) { diff --git a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java index 596435a350e1..10bcdad04030 100644 --- a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java +++ b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java @@ -117,8 +117,8 @@ public class ProxyServer extends Thread { if (!proxy.equals(Proxy.NO_PROXY)) { // Only Inets created by PacProxySelector. InetSocketAddress inetSocketAddress = - (InetSocketAddress)list.get(0).address(); - server = new Socket(inetSocketAddress.getAddress(), + (InetSocketAddress)proxy.address(); + server = new Socket(inetSocketAddress.getHostName(), inetSocketAddress.getPort()); sendLine(server, requestLine); } else { |