commit	a2cab72aa5ff730ba2ae987b45398faafffeb505	[log] [tgz]
author	Neil Fuller <nfuller@google.com>	Mon Apr 13 13:06:22 2015 +0100
committer	Neil Fuller <nfuller@google.com>	Thu Apr 16 11:44:31 2015 +0100
tree	283de306182e8f1faff93d4e6515298539d8c21d
parent	9fa0698523b8a573b8862c0e62c533be8bd53bda [diff]

Roll-up of upstream OkHttp and Okio changes

OkHttp:
From b609edd07864d7191dcda8ba1f6c833c9fe170ad
to b40f99a950cb407eff52537a97420bd253a64f63

Okio:
From 654ddf5e8f6311fda77e429c22d5e0e15f713b8d
to b5811711b141b230e4e58f577c79cfbf4c2d4028

Both "to" are head as of 20150413.

Patches applied cleanly without conflicts.

This submission will break some CTS tests due
to https://github.com/square/okhttp/issues/1552
Solutions will be made upstream and patched in.
The CTS tests broken are related to SPDY/HTTP2
which are not used by Android's embedded OkHttp.

Change-Id: I84d55b6f5c8dbc05148e86bd9421a2c393b563d4

Android.mk[diff]
CHANGELOG.md[diff]
README.md[diff]
benchmarks/pom.xml[diff]
mockwebserver/README.md[diff]
mockwebserver/pom.xml[diff]
mockwebserver/src/main/java/com/squareup/okhttp/internal/SslContextBuilder.java[diff]
mockwebserver/src/main/java/com/squareup/okhttp/internal/spdy/SpdyServer.java[diff]
mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockResponse.java[diff]
mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java[diff]
mockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/MockWebServerTest.java[diff]
okcurl/pom.xml[diff]
okcurl/src/main/java/com/squareup/okhttp/curl/Main.java[diff]
okhttp-android-support/pom.xml[diff]
okhttp-android-support/src/main/java/com/squareup/okhttp/internal/huc/JavaApiConverter.java[diff]
okhttp-android-support/src/test/java/com/squareup/okhttp/internal/huc/JavaApiConverterTest.java[diff]
okhttp-android-support/src/test/java/com/squareup/okhttp/internal/huc/ResponseCacheTest.java[diff]
okhttp-apache/pom.xml[diff]
okhttp-hpacktests/pom.xml[diff]
okhttp-hpacktests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDecodeTestBase.java[diff]
okhttp-hpacktests/src/test/java/com/squareup/okhttp/internal/spdy/HpackRoundTripTest.java[diff]
okhttp-hpacktests/src/test/java/com/squareup/okhttp/internal/spdy/hpackjson/HpackJsonUtil.java[diff]
okhttp-tests/pom.xml[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/InterceptorTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/MultipartBuilderTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/OkHttpClientTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/RecordedResponse.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/FaultyFileSystem.java[Added - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp2Test.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft16Test.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/io/InMemoryFileSystem.java[Added - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft10Test.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2FrameLoggerTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft16FrameLoggerTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2Test.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft16Test.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java[diff]
okhttp-urlconnection/pom.xml[diff]
okhttp-ws-tests/pom.xml[Added - diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/RealWebSocketTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/ws/RealWebSocketTest.java - diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/WebSocketReaderTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/ws/WebSocketReaderTest.java - diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/WebSocketWriterTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/ws/WebSocketWriterTest.java - diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/ws/WebSocketCallTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/ws/WebSocketCallTest.java - diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/ws/WebSocketRecorder.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/ws/WebSocketRecorder.java - diff]
okhttp-ws/README.md[Added - diff]
okhttp-ws/pom.xml[Added - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/internal/ws/RealWebSocket.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/RealWebSocket.java - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/internal/ws/WebSocketProtocol.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/WebSocketProtocol.java - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/internal/ws/WebSocketReader.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/WebSocketReader.java - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/internal/ws/WebSocketWriter.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/WebSocketWriter.java - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/ws/WebSocket.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/WebSocket.java - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/ws/WebSocketCall.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/WebSocketCall.java - diff]
okhttp-ws/src/main/java/com/squareup/okhttp/ws/WebSocketListener.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/ws/WebSocketListener.java - diff]
okhttp/pom.xml[diff]
okhttp/src/main/java/com/squareup/okhttp/Cache.java[diff]
okhttp/src/main/java/com/squareup/okhttp/Call.java[diff]
okhttp/src/main/java/com/squareup/okhttp/ConnectionSpec.java[diff]
okhttp/src/main/java/com/squareup/okhttp/MultipartBuilder.java[diff]
okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java[diff]
okhttp/src/main/java/com/squareup/okhttp/Protocol.java[diff]
okhttp/src/main/java/com/squareup/okhttp/Request.java[diff]
okhttp/src/main/java/com/squareup/okhttp/RequestBody.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/FaultHidingSink.java[Added - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/Util.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpConnection.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/io/FileSystem.java[Added - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Hpack.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft10.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Http2.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft16.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java[diff]
okio/CHANGELOG.md[diff]
okio/README.md[diff]
okio/benchmarks/pom.xml[diff]
okio/okio/pom.xml[diff]
okio/okio/src/main/java/okio/Base64.java[diff]
okio/okio/src/main/java/okio/Buffer.java[diff]
okio/okio/src/main/java/okio/BufferedSink.java[diff]
okio/okio/src/main/java/okio/BufferedSource.java[diff]
okio/okio/src/main/java/okio/ByteString.java[diff]
okio/okio/src/main/java/okio/DeflaterSink.java[diff]
okio/okio/src/main/java/okio/GzipSink.java[diff]
okio/okio/src/main/java/okio/InflaterSource.java[diff]
okio/okio/src/main/java/okio/Okio.java[diff]
okio/okio/src/main/java/okio/RealBufferedSink.java[diff]
okio/okio/src/main/java/okio/RealBufferedSource.java[diff]
okio/okio/src/main/java/okio/Segment.java[diff]
okio/okio/src/main/java/okio/SegmentPool.java[diff]
okio/okio/src/main/java/okio/SegmentedByteString.java[Added - diff]
okio/okio/src/main/java/okio/Util.java[diff]
okio/okio/src/test/java/okio/BufferTest.java[diff]
okio/okio/src/test/java/okio/BufferedSinkTest.java[diff]
okio/okio/src/test/java/okio/BufferedSourceTest.java[diff]
okio/okio/src/test/java/okio/ByteStringTest.java[diff]
okio/okio/src/test/java/okio/DeflaterSinkTest.java[diff]
okio/okio/src/test/java/okio/GzipSinkTest.java[diff]
okio/okio/src/test/java/okio/InflaterSourceTest.java[diff]
okio/okio/src/test/java/okio/SegmentSharingTest.java[Added - diff]
okio/okio/src/test/java/okio/TestUtil.java[diff]
okio/pom.xml[diff]
pom.xml[diff]
samples/crawler/pom.xml[diff]
samples/crawler/src/main/java/com/squareup/okhttp/sample/Crawler.java[diff]
samples/guide/pom.xml[diff]
samples/guide/src/main/java/com/squareup/okhttp/recipes/CustomTrust.java[Added - diff]
samples/guide/src/main/java/com/squareup/okhttp/recipes/Progress.java[Added - diff]
samples/guide/src/main/java/com/squareup/okhttp/recipes/WebSocketEcho.java[diff]
samples/pom.xml[diff]
samples/simple-client/pom.xml[diff]
samples/static-server/pom.xml[diff]
website/index.html[diff]

119 files changed

tree: 283de306182e8f1faff93d4e6515298539d8c21d

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.