aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-11-09Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB""android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releaseThierry Strudel
2015-11-04DO NOT MERGE Revert "okio: increase segment size to 8 KiB"Ye Wen
2015-10-23Fix Http(s)URLConnectionImpl.getInstanceFollowsRedirects()marshmallow-mr1-devNeil Fuller
2015-10-01am e0d02d71: Reduce the memory requirements of a testmarshmallow-dr-devNeil Fuller
2015-09-30Reduce the memory requirements of a testNeil Fuller
2015-09-22okio: increase segment size to 8 KiBThierry Strudel
2015-08-12am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add f...android-cts-6.0_r1marshmallow-devNeil Fuller
2015-08-12am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add further handli...Neil Fuller
2015-08-12am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT i...android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10lollipop-mr1-cts-releaselollipop-mr1-cts-devNeil Fuller
2015-08-12Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly re...Neil Fuller
2015-08-10Revert "Revert "Add further handling for when a CONNECT incorrectly returns a...Neil Fuller
2015-08-07am fe5cf4e1: am 6e829118: (-s ours) am ce55fb3f: Merge "Revert "Add further h...Neil Fuller
2015-08-07am 6e829118: (-s ours) am ce55fb3f: Merge "Revert "Add further handling for w...Neil Fuller
2015-08-07am ce55fb3f: Merge "Revert "Add further handling for when a CONNECT incorrect...Neil Fuller
2015-08-07Merge "Revert "Add further handling for when a CONNECT incorrectly returns a ...Neil Fuller
2015-08-04Merge "Revert "Add further handling for when a CONNECT incorrectly returns a ...android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4lollipop-cts-releaselollipop-cts-devNeil Fuller
2015-07-30Allow HttpEngine to retry connections on timeout / interruption.Narayan Kamath
2015-07-17Revert "Add further handling for when a CONNECT incorrectly returns a body."Neil Fuller
2015-06-15Apply upstream changes for timeout / pooled connection issueNeil Fuller
2015-06-11Fix for HttpURLConnection not always throwing SocketTimeoutExceptionNeil Fuller
2015-05-28Fix flaky test Spdy3ConnectionTest.receiveGoAway().jwilson
2015-05-13am c1897821: am 1aeac900: am b8b31e4b: Reduce flakiness of OkHttp tests autom...Neil Fuller
2015-05-13am 1aeac900: am b8b31e4b: Reduce flakiness of OkHttp tests automerge: 81ed04aNeil Fuller
2015-05-13am b8b31e4b: Reduce flakiness of OkHttp tests automerge: 81ed04aNeil Fuller
2015-05-08Rollup of upstream OkHttp and Okio changesNeil Fuller
2015-05-07Reduce flakiness of OkHttp testsandroid-cts-5.1_r2Neil Fuller
2015-05-06am 5c8574a4: am 12985b2c: am 81ed04a6: Reduce flakiness of OkHttp testsNeil Fuller
2015-05-06am 12985b2c: am 81ed04a6: Reduce flakiness of OkHttp testsNeil Fuller
2015-05-06am 81ed04a6: Reduce flakiness of OkHttp testsNeil Fuller
2015-05-01Reduce flakiness of OkHttp testsandroid-cts-5.0_r3Neil Fuller
2015-04-16am 4e1c4bb4: Merge "Roll-up of upstream OkHttp and Okio changes"Neil Fuller
2015-04-16Merge "Roll-up of upstream OkHttp and Okio changes"Neil Fuller
2015-04-16Roll-up of upstream OkHttp and Okio changesNeil Fuller
2015-03-31am 9fa06985: Merge "Remove -encoding UTF-8, it is now the default"Colin Cross
2015-03-31Merge "Remove -encoding UTF-8, it is now the default"android-wear-5.1.1_r1android-wear-5.1.0_r1Colin Cross
2015-03-30Remove -encoding UTF-8, it is now the defaultColin Cross
2015-03-26am 56d34066: Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin
2015-03-26Merge "Honor NetworkSecurityPolicy regarding cleartext traffic."Alex Klyubin
2015-03-25Honor NetworkSecurityPolicy regarding cleartext traffic.Alex Klyubin
2015-02-12am 63e93d45: am b3ed2930: Merge "A rollup of recent upstream commits for OkHttp"Neil Fuller
2015-02-12am b3ed2930: Merge "A rollup of recent upstream commits for OkHttp"Neil Fuller
2015-02-12Merge "A rollup of recent upstream commits for OkHttp"Neil Fuller
2015-02-11A rollup of recent upstream commits for OkHttpNeil Fuller
2015-02-09am 74a968d0: am 75a7afac: Reduce flakiness of OkHttp testsNeil Fuller
2015-02-09am 75a7afac: Reduce flakiness of OkHttp testsNeil Fuller
2015-02-09Reduce flakiness of OkHttp testsandroid-cts-5.1_r1android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devNeil Fuller
2015-01-23am 711381f2: am 576c6599: Merge "Clean up comments that still reference NPN."Neil Fuller
2015-01-23am cc33cfd7: am 2fa2cab5: Merge "Tidy up HttpsHandler / HttpHandler and chang...Neil Fuller
2015-01-23am 576c6599: Merge "Clean up comments that still reference NPN."Neil Fuller
2015-01-23Merge "Clean up comments that still reference NPN."Neil Fuller