| commit | 231519b0362806e99f234e4bd136d04627605f73 | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Tue Jun 21 17:25:00 2016 +0100 |
| committer | Tobias Thierer <tobiast@google.com> | Wed Jun 29 16:50:57 2016 +0100 |
| tree | 08114f0c337a8d0ae8731b69b69d391d23f3224f | |
| parent | 846bb9b38a79185d7aa9e056eb3990f9b6722bf0 [diff] |
Apply upstream commit: Let SocksProxy use the same definition of localhost as MockWebServer.
This fixes SocksProxyTest failing on some systems. The problem was that
MockWebServer is listening on InetAddress.getByName("localhost") but
SocksProxy was trying to connect to InetAddress.getLoopbackAddress().
This is not guaranteed to work, for example on recent AOSP, "localhost"
resolves to 127.0.0.1 but getLoopbackAddress() is ::1 (IPv6).
This CL makes the simplest change to make the two consistent so that
SocksProxyTest passes. In the long run, OkHttp may want to consider
using getLoopbackAddress().getHostname() everywhere instead of hard
coding the hostname "localhost" at all.
(cherry picked from upstream commit df73a7e98e8450813325d28458b6bdd4b8b11791)
Change-Id: Ib0e860ea1a8646c4e2b9739974486159294a8fdc
An HTTP & SPDY client for Android and Java applications. For more information see the website and the wiki.
Download the latest JAR or grab via Maven:
<dependency> <groupId>com.squareup.okhttp</groupId> <artifactId>okhttp</artifactId> <version>2.6.0</version> </dependency>
or Gradle:
compile 'com.squareup.okhttp:okhttp:2.6.0'
Snapshots of the development version are available in Sonatype's snapshots repository.
A library for testing HTTP, HTTPS, HTTP/2.0, and SPDY clients.
MockWebServer coupling with OkHttp is essential for proper testing of SPDY and HTTP/2.0 so that code can be shared.
Download the latest JAR or grab via Maven:
<dependency> <groupId>com.squareup.okhttp</groupId> <artifactId>mockwebserver</artifactId> <version>2.6.0</version> <scope>test</scope> </dependency>
or Gradle:
testCompile 'com.squareup.okhttp:mockwebserver:2.6.0'
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.