| eaf55917fcd2f118e26d6b31dcaf9fb8f3ad0d1f |
|
22-Feb-2016 |
jwilson <jwilson@squareup.com> |
Apply: Make IPv6 request lines consistent with Firefox and Chrome.
Backport upstream OkHttp commit 7ceaa2387f0be853222f5a1496f1f743fa6f8c6d
(from OkHttp 3.2) to Android. Because Android's OkHttp is based on
2.7.5, this involved tweaks in CallTest and elsewhere to
- in CallTest to call setters on OkHttpClient instead of using a
OkHttpClient.Builder to construct a new instance.
- use request.httpUrl() instead of OkHttp 3's request.url().
- dropped a "." at the end of a line comment in Http2xStream.java
to keep the line length at 100 characters to avoid breaking
style checks when running OkHttp's tests using "mvn clean verify"
This commit fixes two separate bugs (upstream may only have been aware
of (1.)):
(1.) when attempting to tunnel a https connection over http, the host
header didn't include the :443, like it should.
This bug was not tracked on Android as far as I'm aware;
URLConnectionTest was previously asserting the incorrect behavior.
(2.) attempting to connect to a literal IPv6 address such as
http://[::1]/ would crash because HttpUrl's host accessor
returned the "::1" without [] but HttpUrl.Builder required the
[]; this broke the round-trip in HttpEngine.createAddress().
It's likely that this is the root cause of bug 31917371 but
it hasn't been empirically verified that this CL fixes that bug.
To fix (2.), it would probably have been sufficient to only apply the
change to HttpUrl.java, but fixing both bugs and backporting the entire
upstream CL appeared preferable.
Bug: 31917371
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Upstream commit message follows:
Previously we omitted the square braces and explicit port on CONNECT requests
and the square braces in the Host header.
Closes https://github.com/square/okhttp/issues/2344
Change-Id: I844bfc06bf3a4f56a61a825a71165367ad762a15
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
|
| 6c251e20f00c7574b217bd4351ac81666f574380 |
|
24-Jun-2016 |
Tobias Thierer <tobiast@google.com> |
Update OkHttp to 2.7.5 and advance okio by one commit.
This brings OkHttp and okio exactly in line with upstream commits
with no local changes.
Corresponding upstream commits:
okhttp:6e236ce3b80f21369dc544f0e1053ff71be8689b (= parent-2.7.5)
okio: 02481cc0cc84bc92e3eab6d5212a226496f56a7e
The okio commit differs from the one in the previous pull from
Sep 2015 (AOSP commit 71b9f47b26fb57ac3e436a19519c6e3ec70e86eb)
only by a single upstream commit, the switch to 8 KiB segments.
That commit was previously cherry-picked in AOSP. This CL will
temporarily revert the AOSP changes to okio, but those
AOSP changes to okio will be reapplied in the subsequent CL.
Compilation and tests do not pass after this CL, they will only
pass at the end of the chain of 11 CLs going in at the same time.
9 of these 11 CLs are in external/okhttp, the others affect
libcore and frameworks/base.
Details of behavioural changes introduced by this upgrade are at:
https://docs.google.com/document/d/19PF3Exd_q32gAGCiRFWRf0Pq_xrIWs-cRViHkFTxJg8/edit
This CL includes files that are not used in Android, such as
- top level dot files (.travis.yml etc.)
- subdirectories okurl, okhttp-apache, samples, which aren't used
- tests in okhttp-hpacktests, okhttp-ws-tests that aren't run
or test functionality that we aren't used
Test: I've run the following tests *at the end* of the chain of
commits, in cts-tradefed:
1.) run cts -p android.core.tests.libcore.package.harmony_java_net
2.) run cts -c libcore.java.net.URLConnectionTest
3.) run cts -p android.core.tests.libcore.package.okhttp
4.) run cts -p android.core.tests.libcore.package.libcore
1.-3.) all passed
4.) had 24 unrelated failures per b/29496407 and b/29744850
Change-Id: Id798d6cf49fa4a7a4ab8ae3b699a38104bf42db3
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
|
| 71b9f47b26fb57ac3e436a19519c6e3ec70e86eb |
|
16-Sep-2015 |
Neil Fuller <nfuller@google.com> |
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
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
|
| ed078614cd7c89aae39dce0615f8cbbf955b2a90 |
|
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
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
|
| 7aeaaefc891f6221f4b2cce536b1c1e816e09794 |
|
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.
Change-Id: I98ed1cc1debf7e03c5895bec38ea5cf9e402b144
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.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
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.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
/external/okhttp/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
|