| commit | 0f102f51711ecc2ef9f25cbbad2148ee97bdb6cb | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed Nov 05 03:41:20 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Tue Dec 02 15:11:03 2014 +0000 |
| tree | b8a9c346e03d1b1fa26114e070426910828f25bc | |
| parent | 466ef072d672d6c5cce3da222f76828427680e53 [diff] |
Add further handling for when a CONNECT incorrectly returns a body. Before the change: If a proxy returns a body and some of the body bytes have already been buffered then an IOException is thrown. If the body bytes have not been buffered then the handshake will fail due to the presence of bytes where the Server HELLO is expected, typically with some kind of SSLHandshakeException. After the change: The body bytes are consumed to ensure consistent behavior. The handshake will then take place. History: This is an unusual case that would occasionally cause failures on Android when a ResponseCache was installed. Android introduced a patch to prevent CONNECT responses being cached. Since then, OkHttp has changed the code and probably fixed the issue via other means. The Android test remained and would sometimes experience one exception, sometimes another, depending on the state of the buffer. If the presence of a body is a possibility it would be nice to deal with it consistently and deterministically. The motivation for this change is to make an Android test equivalent to the one added here behave consistently and in a way that doesn't involve connection fallback. The only risk with this change is if a proxy is incorrectly reporting the content length: this might lead to blocking on the body read/skip (as OkHttp would probably do elsewhere if a server mis-reports a content-length). This may make connections to "bad" proxies slightly more reliable. Bug: 6754912 Bug: 18575971 (cherry picked from commit 007b88ad6df622a2e5daacce604637d006ed6212) Change-Id: Icf9e17a26dd2b1c4024935dfae3e87b2654a220e
An HTTP & SPDY client for Android and Java applications.
For more information please see the website.
Download the latest JAR or grab via Maven:
<dependency> <groupId>com.squareup.okhttp</groupId> <artifactId>okhttp</artifactId> <version>(insert latest version)</version> </dependency>
OkHttp requires Java 7 to build and run tests. Runtime compatibility with Java 6 is enforced as part of the build to ensure compliance with Android and older versions of the JVM.
Run OkHttp tests on the desktop with Maven. Running SPDY tests on the desktop uses Jetty-NPN which requires OpenJDK 7+.
mvn clean test
OkHttp's test suite creates an in-process HTTPS server. Prior to Android 2.3, SSL server sockets were broken, and so HTTPS tests will time out when run on such devices.
Test on a USB-attached Android using Vogar. Unfortunately dx requires that you build with Java 6, otherwise the test class will be silently omitted from the .dex file.
mvn clean
mvn package -DskipTests
vogar \
--classpath ~/.m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar \
--classpath mockwebserver/target/mockwebserver-2.0.0-SNAPSHOT.jar \
--classpath okhttp-protocols/target/okhttp-protocols-2.0.0-SNAPSHOT.jar \
--classpath okhttp/target/okhttp-2.0.0-SNAPSHOT.jar \
okhttp/src/test
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>(insert latest version)</version> <scope>test</scope> </dependency>
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.