| df2c498a3d4dc641c7b609873adf905848ace382 |
12-Jun-2015 |
Neil Fuller <nfuller@google.com> |
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
ava/okio/ForwardingTimeout.java
ava/okio/Timeout.java
|
| ba6e9e96cd027a16f5f555966f332f8799da8b74 |
27-May-2015 |
Neil Fuller <nfuller@google.com> |
Fix for HttpURLConnection not always throwing SocketTimeoutException
Contains upstream changes:
Okio: https://github.com/square/okio/pull/154
OkHttp: https://github.com/square/okhttp/pull/1698 (pending)
Bug: 21396523
(cherry-picked from commit b5f9076b16fcc41c3dad31aecfdcfd962a7a1f75)
Change-Id: I4d44e973f906d41a622598e2293d4026fc1ed039
ava/okio/AsyncTimeout.java
ava/okio/Okio.java
|
| 781c9c216deed11c44044d23841a4ba6a012106e |
07-May-2015 |
Neil Fuller <nfuller@google.com> |
Rollup of upstream OkHttp and Okio changes
OkHttp from: b5811711b141b230e4e58f577c79cfbf4c2d4028
to: 3c61fdb2ba9d1ebe0419b93cfbd4e94ffc857fe3
Okio from: b40f99a950cb407eff52537a97420bd253a64f63
to: b76b6903ef05546c5aef249ea6b2b679bc43094b
Both "to" are head as of 20150505.
Patches applied cleanly without conflicts except for
okio/okio/src/test/java/okio/BufferedSourceTest.java
which has local Android changes to account for Android
CTS only supporting Junit 4.10.
There are various changes included most of which will
not affect Android.
OkHttp changes of note for Android:
1) Improvements to TLS negotiation.
Upstream commit 60f5406dcc094d0431420139bd002e8bdd4ea5d5
https://github.com/square/okhttp/pull/1388
2) Fix for CTS tests on Android.
Upstream commit fb155c47661ede5da395dfb4e620867263b8c8e7
https://github.com/square/okhttp/pull/1555
3) Switch to using Okio for form URL encoding
Upstream commit 2a4c1f288d284d3266b5aec4decb167a3af0a976
https://github.com/square/okhttp/pull/1563
4) Fix Vary caching on Android.
Upstream commit b7baf23d86305762ea4e42adc4054c0840eca5ca
https://github.com/square/okhttp/pull/1590
5) Report some TLS issues during negotiation (not all)
Upstream commit 71ead1911be28c1cae1eef765abf23724b776981
https://github.com/square/okhttp/pull/1596
Okio changes of note for Android:
1) Fix for truncated GZIP streams
Upstream commit 3e25d85bc4ad3c6f1622b0438b3976804958fbfb
https://github.com/square/okhttp/issues/1540
Additional android-specific changes:
Suppress a new test that requires JUnit 4.11 and Gson in the
Android.mk file.
(cherry-picked from 7aeaaefc891f6221f4b2cce536b1c1e816e09794)
Bug: 20566983
Change-Id: Ib818478513ec712b1391b82e2376fc410eaaa737
ava/okio/Buffer.java
ava/okio/BufferedSink.java
ava/okio/BufferedSource.java
ava/okio/RealBufferedSink.java
ava/okio/RealBufferedSource.java
|
| a2cab72aa5ff730ba2ae987b45398faafffeb505 |
13-Apr-2015 |
Neil Fuller <nfuller@google.com> |
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
ava/okio/Base64.java
ava/okio/Buffer.java
ava/okio/BufferedSink.java
ava/okio/BufferedSource.java
ava/okio/ByteString.java
ava/okio/DeflaterSink.java
ava/okio/GzipSink.java
ava/okio/InflaterSource.java
ava/okio/Okio.java
ava/okio/RealBufferedSink.java
ava/okio/RealBufferedSource.java
ava/okio/Segment.java
ava/okio/SegmentPool.java
ava/okio/SegmentedByteString.java
ava/okio/Util.java
|
| 3be78b8b0ca13d9e05e2327acb8d8654f719a3f6 |
11-Feb-2015 |
Neil Fuller <nfuller@google.com> |
A rollup of recent upstream commits for OkHttp
squareup/okhttp commits from:
0a197466608681593cc9be9487965a0b1d5c244c
to:
b609edd07864d7191dcda8ba1f6c833c9fe170ad
squareup/okio commits from:
654ddf5e8f6311fda77e429c22d5e0e15f713b8d
to
82358df7f09e18aa42348836c614212085bbf045
Changes that might affect Android:
1) Cache control request headers: If-None-Match
or If-Modified-Since sent, never both.
2) Make okhttp behave more like a private, not a
shared cache.
3) SSLPeerUnverifiedException now thrown on
hostname verification errors, not IOException.
Change-Id: I3a2e8ae9bebfec84eaf8eb2aaa70085fa40fadd5
ava/okio/ByteString.java
ava/okio/Sink.java
|
| e78f117bcbd6b57d783737107f445ef75ecb474a |
20-Jan-2015 |
Neil Fuller <nfuller@google.com> |
Pull latest OkHttp code from upstream
okio:
okio is now managed upstream as a separate project but has
been included here as a sub directory: the okio version here
is intended only for use with OkHttp.
okio is synced to upstream commit
82358df7f09e18aa42348836c614212085bbf045.
See okio/README.android for local changed needed to make it
compile.
okhttp:
This is effectively an upgrade from a snapshot close to
OkHttp 1.5 with Android additions to a snapshot close to
OkHttp 2.2.
okhttp was synced to upstream commit
0a197466608681593cc9be9487965a0b1d5c244c
See README.android for local changes needed to make it
compile.
Most of the old Android changes have been pushed upstream
and other upstream changes have been made to keep OkHttp
working on Android.
TLS fallback changes have not been upstreamed yet:
bcce0a3d26d66d33beb742ae2adddb3b7db5ad08
ede2bf1af0917482da8ccb7b048130592034253d
This means that some CTS tests will start to fail. A later
commit will fix those changes when it has been accepted
upstream.
There are associated changes in libcore and frameworks/base.
Change-Id: I0a68b27b1ec7067be452671bc591edfd84e310f2
ava/okio/AsyncTimeout.java
ava/okio/Base64.java
ava/okio/Buffer.java
ava/okio/BufferedSink.java
ava/okio/BufferedSource.java
ava/okio/ByteString.java
ava/okio/DeflaterSink.java
ava/okio/ForwardingSink.java
ava/okio/ForwardingSource.java
ava/okio/GzipSink.java
ava/okio/GzipSource.java
ava/okio/InflaterSource.java
ava/okio/Okio.java
ava/okio/RealBufferedSink.java
ava/okio/RealBufferedSource.java
ava/okio/Segment.java
ava/okio/SegmentPool.java
ava/okio/Sink.java
ava/okio/Source.java
ava/okio/Timeout.java
ava/okio/Util.java
ava/okio/package-info.java
|