Apply upstream changes for timeout / pooled connection issue

This change contains two upstream commits:

Okio:

Upstream commit: a4aee7d9594a2eae48cd274163003e0566719b91

Author: jwilson <jwilson@squareup.com>
Date:   Sat May 16 08:19:39 2015 -0400

    Change Timeout.throwIfReached() to throw InterruptedIOException

    Previously this was throwing IOException, but nothing was anticipated
    that. This is slightly semantically incorrect; the thread wasn't
    interrupted. But it's much more convenient to use a single exception
    type for both timeouts.

    Also add a new type, ForwardingTimeout.

OkHttp:

Upstream commit: 4df674f8c5e2c07d881b4f2780922c7d15940814

Author: jwilson <jwilson@squareup.com>
Date:   Sat May 16 10:35:59 2015 -0400

    Don't share timeouts between pooled connections.

    This was causing crashes.

    Closes https://github.com/square/okio/issues/133

Bug: 21799272
Change-Id: I6f38fa8aae7dfaa74361500b75ecd09f41eb1f91
4 files changed
tree: fe94bd4ea971d05d445f6c1cfa061a04cb693ac9
  1. Android.mk
  2. CHANGELOG.md
  3. CONTRIBUTING.md
  4. LICENSE.txt
  5. MODULE_LICENSE_APACHE2
  6. NOTICE
  7. README.android
  8. README.md
  9. android/
  10. benchmarks/
  11. checkstyle.xml
  12. deploy_website.sh
  13. jarjar-rules.txt
  14. mockwebserver/
  15. okcurl/
  16. okhttp-android-support/
  17. okhttp-apache/
  18. okhttp-hpacktests/
  19. okhttp-testing-support/
  20. okhttp-tests/
  21. okhttp-urlconnection/
  22. okhttp-ws-tests/
  23. okhttp-ws/
  24. okhttp/
  25. okio/
  26. pom.xml
  27. samples/
  28. website/
README.md

OkHttp

An HTTP & SPDY client for Android and Java applications. For more information see the website and the wiki.

Download

Download the latest JAR or grab via Maven:

<dependency>
  <groupId>com.squareup.okhttp</groupId>
  <artifactId>okhttp</artifactId>
  <version>2.3.0</version>
</dependency>

or Gradle:

compile 'com.squareup.okhttp:okhttp:2.3.0'

Snapshots of the development version are available in Sonatype's snapshots repository.

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>2.3.0</version>
  <scope>test</scope>
</dependency>

or Gradle:

testCompile 'com.squareup.okhttp:mockwebserver:2.3.0'

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.