aboutsummaryrefslogtreecommitdiffstats
path: root/okhttp-urlconnection/src
Commit message (Collapse)AuthorAgeFilesLines
* Add TEST_MAPPINGS for external/okhttp.Pete Gillin2019-09-043-0/+21
| | | | | | | | These are simple package-to-package mappings. Test: treehugger Bug: 130283485 Change-Id: I3320d2adfee520910009249f8ed00861641c90e3
* Let HttpsURLConnection.setSSLSocketFactory(null) throw IAE.Tobias Thierer2018-08-171-0/+9
| | | | | | | | | | | | | | | | | | | | | | | HttpsURLConnection.setSSLSocketFactory(null) is documented to throw IAE. Since at least Android KitKat, it instead reset the connection to use the default SSLSocketFactory. This was because HttpsURLConnectionImpl delegated to OkHttpClient, which interpreted a null value to mean to use the default. This CL fixes the behavior to be consistent with documentation. The corresponding bug has been fixed in upstream OkHttp through commit f704f9d30e941ebdbdc95843c931cfc9d34bcba6 . This CL topic backports that change and the corresponding fix into Android's implementation, which is still based on OkHttp 2.7.5. Bug: 73702052 Test: libcore's URLConnectionTest.testNullSSLSocketFactory_throws() fails before but passes after this CL. Change-Id: I593a4a9b826608e30c345a490c136722aead8cbd
* Apply upstream commit: Add basic URLFilter for HttpURLConnectionChad Brubaker2016-06-295-2/+84
| | | | | | | | | | | | | | | | | This was previously commit to AOSP as 27c80533a9a92e3e12ed0857515ba493666fe6ac The upstream commit was contained in OkHttp 3.0 but not 2.7.5. Previous commit message: This optional filter can be used to allow for blocking HTTP traffic to certain URLs, for example in order to prevent accessing sensitive content over HTTP instead of HTTPS. https://github.com/square/okhttp/pull/2275 (cherry-picked from upstream commit 2b1f9a20bac5d99acf5a8be36754e5a1dadaf448) Change-Id: Icb6057e9d32752c948d92c3973a4d67fd48cb43d
* Update OkHttp to 2.7.5 and advance okio by one commit.Tobias Thierer2016-06-296-107/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Revert obsolete parts of 'Android modifications to OkHttp'Tobias Thierer2016-06-261-10/+6
| | | | | | | | | | | | | | | | | Reverts parts of AOSP commit 36132b3cd2c814e057c775adc821ae0fb12aeb4c This CL was created with the following command line: $ git show --patch 36132b3cd2c814e057c775adc821ae0fb12aeb4c \ okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpsURLConnectionImpl.java \ okhttp-android-support/src/main/java/com/squareup/okhttp/internal/huc/JavaApiConverter.java \ | patch -R -p1 Test: Ran the following tests. The only failure was b/29095428 $ cts-tradefed run cts -c libcore.java.net.URLConnectionTest $ cts-tradefed run cts -p android.core.tests.libcore.package.okhttp Bug: 29633179 Change-Id: I2d4c3faea516eb586816f4445611f120691175e3
* Add basic URLFilter for HttpURLConnectionChad Brubaker2016-01-285-2/+82
| | | | | | | | | | | This optional filter can be used to allow for blocking HTTP traffic to certain URLs, for example in order to prevent accessing sensitive content over HTTP instead of HTTPS. https://github.com/square/okhttp/pull/2275 (cherry-picked from upstream commit 2b1f9a20bac5d99acf5a8be36754e5a1dadaf448) Change-Id: I727c2751a745f24969a838d5bb996a976e9f7a56
* Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()Neil Fuller2015-10-231-0/+4
| | | | | | | | | This is the proposed upstream PR: https://github.com/square/okhttp/pull/1939 Bug: 25138800 Bug: https://code.google.com/p/android/issues/detail?id=190998 Change-Id: I3873cb59b8cd95aef2641d6b238ac65341eaba12
* Android modifications to OkHttpNeil Fuller2015-09-171-6/+10
| | | | | | | | | | | | | | | | | | | | Re-introduce Android integration classes and make the modifications necessary to get OkHttp/Okio to compile against Android. The only Android-specific change made over prior versions of this code is in Platform to remove the toURILenient() method (no longer used by OkHttp). This commit also includes pending PR https://github.com/square/okhttp/pull/1858 to fix two tests on Android: com.squareup.okhttp.URLConnectionTest#connectViaHttpsWithSSLFallback com.squareup.okhttp.CallTest#recoverFromTlsHandshakeFailure_Async Bug: 22943975 Bug: 23553256 Change-Id: I4c718c96fbd5fe3f2353ce422f8de3b95d0b75ee
* Pull latest code from upstream okhttp and okioNeil Fuller2015-09-174-53/+50
| | | | | | | | | | | | | | | | | | 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
* Rollup of upstream OkHttp and Okio changesNeil Fuller2015-05-071-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* A rollup of recent upstream commits for OkHttpNeil Fuller2015-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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
* Pull latest OkHttp code from upstreamNeil Fuller2015-01-207-0/+3214
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-14 11:58:56 +0000