Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change PacProxySelector to return unresolved addr" into klp-dev

Browse Source
This commit is contained in:
Jason Monk
2013-10-31 18:43:53 +00:00
committed by Android (Google) Code Review
parent a0bc738f46 179d6e8e20
commit 86f5a1499b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/PacProxySelector.java
View File

@@ -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) {

4
packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java
View File

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