Pull upstream fixes from OkHttp

This synced to commit bda555ad61ef55e9ad6e4a30d2e9cfde5fc216ca
/ master / 21st March 2014.

Notably this contains a fix for apps that bundle an older
copy of OkHttp or which call android.net.http.HttpResponseCache.get()
or android.net.http.HttpResponseCache.put().

See for details:
https://github.com/square/okhttp/commit/6cf56de5d0701ff26aa6043c552e17c4665c1287
https://github.com/square/okhttp/commit/e2599be9e073f1be8e929597c358e2664ab0c9a9

Change-Id: I324ac76d8ee6a615c39dc8e19dc90169528ae072
10 files changed
tree: cfd483afbe2b2bd821a1568b0a10fb4c6b3c9bba
  1. android/
  2. benchmarks/
  3. mockwebserver/
  4. okcurl/
  5. okhttp/
  6. okhttp-apache/
  7. okhttp-tests/
  8. okio/
  9. samples/
  10. website/
  11. Android.mk
  12. CHANGELOG.md
  13. checkstyle.xml
  14. concurrency.md
  15. CONTRIBUTING.md
  16. deploy_website.sh
  17. jarjar-rules.txt
  18. LICENSE.txt
  19. MODULE_LICENSE_APACHE2
  20. pom.xml
  21. README.android
  22. README.md
README.md

OkHttp

An HTTP & SPDY client for Android and Java applications.

For more information please see the website.

Download

Download the latest JAR or grab via Maven:

<dependency>
    <groupId>com.squareup.okhttp</groupId>
    <artifactId>okhttp</artifactId>
    <version>(insert latest version)</version>
</dependency>

Building

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.

Testing

On the Desktop

Run OkHttp tests on the desktop with Maven. Running SPDY tests on the desktop uses Jetty-NPN which requires OpenJDK 7+.

mvn clean test

On a Device

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

MockWebServer

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

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>

License

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.