diff options
| author | Neil Fuller <nfuller@google.com> | 2015-05-07 13:14:41 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2015-05-07 13:20:40 +0100 |
| commit | 7aeaaefc891f6221f4b2cce536b1c1e816e09794 (patch) | |
| tree | 041755cbfa3a66fa53d478a70ca12d82cf620850 /checkstyle.xml | |
| parent | 4e1c4bb443c9c760e5f64bdc926811634b3275cd (diff) | |
| download | okhttp-7aeaaefc891f6221f4b2cce536b1c1e816e09794.tar.gz | |
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
Diffstat (limited to 'checkstyle.xml')
| -rw-r--r-- | checkstyle.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/checkstyle.xml b/checkstyle.xml index f725be3..fc173af 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -66,7 +66,9 @@ <module name="LineLength">
<property name="max" value="100"/>
</module>
- <module name="MethodLength"/>
+ <module name="MethodLength">
+ <property name="max" value="200"/>
+ </module>
<!-- Checks for whitespace -->
|