commit	71b9f47b26fb57ac3e436a19519c6e3ec70e86eb	[log] [tgz]
author	Neil Fuller <nfuller@google.com>	Wed Sep 16 17:39:32 2015 +0100
committer	Neil Fuller <nfuller@google.com>	Thu Sep 17 09:28:41 2015 +0100
tree	076fe135bc9d4bb0ae79ec94a5cba3649c18dd49
parent	bad0a11146d43955d3f3b949aa277f0dd7cc3abb [diff]

Pull latest code from upstream okhttp and okio

This change contains the OkHttp and Okio changes without
modification. The only additions are the
MODULE_LICENSE_APACHE2 files.

This corresponds closely to OkHttp 2.5.0 and
Okio 1.6.0. Behavior changes are documented in
CHANGELOG.md.

This change does not compile as is. The next
commit makes the Android modifications required.

okhttp: 4305dc3fabeab392eb56f2db51538e06c3a54e51
okio: 313436764bf35794e158c6171e319fee868298df

Change-Id: I97ce07ff0472cdbce09f588863a1e5ccdcea0c20

Android.mk[Deleted - diff]
BUG-BOUNTY.md[Added - diff]
CHANGELOG.md[diff]
NOTICE[Deleted - diff]
README.android[Deleted - diff]
README.md[diff]
android/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java[Deleted - diff]
android/main/java/com/squareup/okhttp/HttpHandler.java[Deleted - diff]
android/main/java/com/squareup/okhttp/HttpsHandler.java[Deleted - diff]
android/main/java/com/squareup/okhttp/internal/Platform.java[Deleted - diff]
android/main/java/com/squareup/okhttp/internal/Version.java[Deleted - diff]
android/test/java/com/squareup/okhttp/ConfigAwareConnectionPoolTest.java[Deleted - diff]
android/test/java/com/squareup/okhttp/internal/PlatformTest.java[Deleted - diff]
benchmarks/pom.xml[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/ApacheHttpClient.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/Benchmark.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/HttpClient.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/NettyHttpClient.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/OkHttp.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/OkHttpAsync.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/SynchronousHttpClient.java[diff]
benchmarks/src/main/java/com/squareup/okhttp/benchmarks/UrlConnection.java[diff]
jarjar-rules.txt[Deleted - diff]
mockwebserver/README.md[diff]
mockwebserver/pom.xml[diff]
mockwebserver/src/main/java/com/squareup/okhttp/internal/framed/FramedServer.java[Renamed from 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/main/java/com/squareup/okhttp/mockwebserver/SocketPolicy.java[diff]
mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/rule/MockWebServerRule.java[Deleted - diff]
mockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/MockWebServerTest.java[diff]
mockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/rule/MockWebServerRuleTest.java[Deleted - diff]
okcurl/pom.xml[diff]
okcurl/src/main/java/com/squareup/okhttp/curl/Main.java[diff]
okcurl/src/test/java/com/squareup/okhttp/curl/MainTest.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/android/HttpResponseCacheTest.java[diff]
okhttp-android-support/src/test/java/com/squareup/okhttp/internal/huc/CacheAdapterTest.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-apache/src/main/java/com/squareup/okhttp/apache/OkApacheClient.java[diff]
okhttp-apache/src/test/java/com/squareup/okhttp/apache/OkApacheClientTest.java[diff]
okhttp-hpacktests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDecodeInteropTest.java[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/Case.java[diff]
okhttp-hpacktests/src/test/java/com/squareup/okhttp/internal/spdy/hpackjson/HpackJsonUtil.java[diff]
okhttp-hpacktests/src/test/java/com/squareup/okhttp/internal/spdy/hpackjson/Story.java[diff]
okhttp-testing-support/pom.xml[diff]
okhttp-testing-support/src/main/java/com/squareup/okhttp/internal/io/InMemoryFileSystem.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/io/InMemoryFileSystem.java - diff]
okhttp-testing-support/src/main/java/com/squareup/okhttp/testing/RecordingHostnameVerifier.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java - diff]
okhttp-tests/pom.xml[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/CertificatePinnerTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSSLSocketFactory.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingServerSocketFactory.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSocketFactory.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/FallbackTestClientSocketFactory.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/FormEncodingBuilderTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/HttpUrlTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/InterceptorTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/OkHttpClientTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/RecordingCallback.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/SocksProxyTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/TestUtil.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/URLConnectionTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/UrlComponentEncodingTester.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformTestRun.java[Deleted - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTestData.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/ConnectionSpecSelectorTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/BaseTestHandler.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/HpackTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/Http2ConnectionTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/Http2FrameLoggerTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2FrameLoggerTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/Http2Test.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2Test.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/HuffmanTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/MockSpdyPeer.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/SettingsTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/Spdy3ConnectionTest.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/framed/Spdy3Test.java[Renamed from okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java - diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/CookiesTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/DisconnectTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteExceptionTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/ThreadInterruptTest.java[diff]
okhttp-tests/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java[diff]
okhttp-tests/src/test/resources/web-platform-test-results-url-chrome-42.0.json[Deleted - diff]
okhttp-tests/src/test/resources/web-platform-test-results-url-firefox-37.0.json[Deleted - diff]
okhttp-tests/src/test/resources/web-platform-test-results-url-safari-7.1.json[Deleted - diff]
okhttp-urlconnection/pom.xml[diff]
okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpURLConnectionImpl.java[diff]
okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java[diff]
okhttp-urlconnection/src/test/java/com/squareup/okhttp/OkUrlFactoryTest.java[diff]
okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java[diff]
okhttp-ws-tests/pom.xml[diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/ws/AutobahnTester.java[diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/ws/WebSocketCallTest.java[diff]
okhttp-ws-tests/src/test/java/com/squareup/okhttp/ws/WebSocketRecorder.java[diff]
okhttp-ws/pom.xml[diff]
okhttp-ws/src/main/java/com/squareup/okhttp/internal/ws/RealWebSocket.java[diff]
okhttp-ws/src/main/java/com/squareup/okhttp/ws/WebSocketCall.java[diff]
okhttp-ws/src/main/java/com/squareup/okhttp/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/CertificatePinner.java[diff]
okhttp/src/main/java/com/squareup/okhttp/Connection.java[diff]
okhttp/src/main/java/com/squareup/okhttp/ConnectionPool.java[diff]
okhttp/src/main/java/com/squareup/okhttp/FormEncodingBuilder.java[diff]
okhttp/src/main/java/com/squareup/okhttp/Headers.java[diff]
okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java[diff]
okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java[diff]
okhttp/src/main/java/com/squareup/okhttp/Request.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/ConnectionSpecSelector.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java[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/framed/ErrorCode.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/FrameReader.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/FrameWriter.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/FramedConnection.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/FramedStream.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Header.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Header.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/HeadersMode.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Hpack.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Hpack.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Http2.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Http2.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Huffman.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/IncomingStreamHandler.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/NameValueBlockReader.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Ping.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/PushObserver.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/PushObserver.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Settings.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Spdy3.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/framed/Variant.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java - diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/AuthenticatorAdapter.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/FramedTransport.java[Renamed from okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.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/RequestLine.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java[diff]
okhttp/src/main/java/com/squareup/okhttp/internal/http/SocketConnector.java[Deleted - diff]
okio/BUG-BOUNTY.md[Added - diff]
okio/CHANGELOG.md[diff]
okio/README.android[Deleted - diff]
okio/README.md[diff]
okio/benchmarks/pom.xml[diff]
okio/okio/pom.xml[diff]
okio/okio/src/main/java/okio/Buffer.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/Okio.java[diff]
okio/okio/src/main/java/okio/RealBufferedSource.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/OkioTest.java[diff]
okio/okio/src/test/java/okio/ReadUtf8LineTest.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/LoggingInterceptors.java[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]

177 files changed

tree: 076fe135bc9d4bb0ae79ec94a5cba3649c18dd49

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.5.0</version>
</dependency>

or Gradle:

compile 'com.squareup.okhttp:okhttp:2.5.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.5.0</version>
  <scope>test</scope>
</dependency>

or Gradle:

testCompile 'com.squareup.okhttp:mockwebserver:2.5.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.