diff options
| author | Jason Monk <jmonk@google.com> | 2013-10-30 12:37:28 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2013-10-31 14:17:48 -0400 |
| commit | 179d6e8e2067c380d3c1f7a1a26877b81a9240cb (patch) | |
| tree | 457fd6fbff59b770f2468f6129597cabf0ec79d6 /packages/services/Proxy/src | |
| parent | 1861284013a2e2d5fd177c1ef66744afd03c3abd (diff) | |
| download | frameworks_base-179d6e8e2067c380d3c1f7a1a26877b81a9240cb.zip frameworks_base-179d6e8e2067c380d3c1f7a1a26877b81a9240cb.tar.gz frameworks_base-179d6e8e2067c380d3c1f7a1a26877b81a9240cb.tar.bz2 | |
Change PacProxySelector to return unresolved addr
This was found by a bug in Firefox where it expects the addresses from a
ProxySelector to be unresolved. Since ProxySelectorImpl returns unresolved
addresses the PAC version should as well to avoid breaking apps.
The ProxyServer also needed to be updated to reflect this change as it was
expecting a resolved InetSocketAddress.
Bug: 11443853
Change-Id: I3a4e9e248d22d7808603c147660df708e01cdf82
Diffstat (limited to 'packages/services/Proxy/src')
| -rw-r--r-- | packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java index 596435a..10bcdad 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 { |