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
ain/java/com/squareup/okhttp/internal/ws/RealWebSocket.java
ain/java/com/squareup/okhttp/ws/WebSocketCall.java
ain/java/com/squareup/okhttp/ws/WebSocketListener.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
ain/java/com/squareup/okhttp/internal/ws/RealWebSocket.java
ain/java/com/squareup/okhttp/internal/ws/WebSocketReader.java
ain/java/com/squareup/okhttp/internal/ws/WebSocketWriter.java
ain/java/com/squareup/okhttp/ws/WebSocketCall.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
ain/java/com/squareup/okhttp/internal/ws/RealWebSocket.java
ain/java/com/squareup/okhttp/internal/ws/WebSocketProtocol.java
ain/java/com/squareup/okhttp/internal/ws/WebSocketReader.java
ain/java/com/squareup/okhttp/internal/ws/WebSocketWriter.java
ain/java/com/squareup/okhttp/ws/WebSocket.java
ain/java/com/squareup/okhttp/ws/WebSocketCall.java
ain/java/com/squareup/okhttp/ws/WebSocketListener.java
|