1
0
mirror of https://github.com/square/okhttp.git synced 2026-01-17 08:42:25 +03:00
Commit Graph

2401 Commits

Author SHA1 Message Date
jwilson
9aa5e87a2c [maven-release-plugin] prepare release parent-3.1.2 parent-3.1.2 2016-02-10 08:37:52 -05:00
Jake Wharton
c0c690adaf Merge pull request #2332 from square/jwilson_0209_robo
Hack in limited support for Robolectric.
2016-02-09 23:07:02 -05:00
jwilson
dd09bdb0de Hack in limited support for Robolectric.
This gets trust manager extraction working, but not ALPN or other
platform features.

Also remove some unused socket tagging features.
2016-02-09 22:47:12 -05:00
Jesse Wilson
3ccb46dd16 Merge pull request #2330 from square/jwilson_0209_dont_pay
Don't pay to clean certificates if we aren't pinning.
2016-02-09 11:20:54 -05:00
jwilson
456a7456ec Don't pay to clean certificates if we aren't pinning. 2016-02-09 11:09:38 -05:00
jwilson
c2e5cc468d Update readme for 3.1.1. 2016-02-07 22:37:32 -05:00
jwilson
258a4fe050 Update changelog for 3.1.1. 2016-02-07 22:35:45 -05:00
jwilson
f152331414 Update changelog for 2.7.4.
Conflicts:
	CHANGELOG.md
2016-02-07 22:35:10 -05:00
jwilson
ef1dbe1297 [maven-release-plugin] prepare for next development iteration 2016-02-07 22:10:22 -05:00
jwilson
0cd6b186b1 [maven-release-plugin] prepare release parent-3.1.1 parent-3.1.1 2016-02-07 22:10:19 -05:00
Jake Wharton
1952a10782 Merge pull request #2325 from square/jwilson_0207_filthy
Support the GMS security provider when searching for the trust manager.
2016-02-07 19:53:47 -05:00
jwilson
44a95fc32f Support the GMS security provider when searching for the trust manager.
Closes https://github.com/square/okhttp/issues/2323
2016-02-07 19:05:28 -05:00
Jake Wharton
417e025a83 Merge pull request #2324 from square/jwilson_0207_optimize_trust_root_index
Don't build a trust root index on Android.
2016-02-07 11:49:13 -05:00
jwilson
784fabac7d Don't build a trust root index on Android.
We can just cheat and use reflection to use Conscrypt's trust root index
directly. This results in a substantial savings in app startup - 500
milliseconds or more.

Closes: https://github.com/square/okhttp/issues/2321
2016-02-07 11:21:22 -05:00
jwilson
61b0558118 Update readme for 3.1.0. 2016-02-06 22:26:14 -05:00
jwilson
8c0b43b800 Update changelog for 2.7.3.
Conflicts:
	CHANGELOG.md
2016-02-06 22:25:20 -05:00
jwilson
50395f9b6a [maven-release-plugin] prepare for next development iteration 2016-02-06 12:59:27 -05:00
jwilson
519ec8adca [maven-release-plugin] prepare release parent-3.1.0 parent-3.1.0 2016-02-06 12:59:23 -05:00
jwilson
7a01a7f4bd Changelog for OkHttp 3.1. 2016-02-06 12:55:13 -05:00
jwilson
2dade17682 Prefer hostname over hostName.
Unfortunately MockWebServer exposes a method getHostName() so I can't
fix it everywhere without breaking the API. But that's a mistake, we
really want it to be hostname going forward.

Also fix some missing copyright statements.
2016-02-06 12:38:21 -05:00
Jake Wharton
2069e159ef Merge pull request #2319 from square/jwilson_0206_ssl_context_cleanups
Generalize the API in SslContextBuilder for fancier tests.
2016-02-06 11:59:14 -05:00
jwilson
457f4994a5 Generalize the API in SslContextBuilder for fancier tests. 2016-02-06 11:52:34 -05:00
Jake Wharton
ec8c095d75 Merge pull request #2317 from square/jw/defer-ws-writes
Defer known-length payload writes when within a segment of completion.
2016-02-05 17:33:27 -05:00
Jake Wharton
cc70a10177 Defer known-length payload writes when within a segment of completion.
This allows both really small bodies and very large buffered bodies to be written as a single frame.
2016-02-05 17:16:54 -05:00
jwilson
65423ac015 Merge branch 'franmontiel-cookie-equals-hashcode'
* franmontiel-cookie-equals-hashcode:
  Override the equals() and hashCode() methods of Cookie
2016-02-01 22:39:51 -05:00
Francisco Montiel
7082ca91bc Override the equals() and hashCode() methods of Cookie
Now it is possible to use Cookies in Collections that depend
on the hash function. (Useful when implementing an in-memory CookieJar)
2016-02-01 22:39:13 -05:00
Jake Wharton
eb179eb419 Merge pull request #2307 from square/jwilson_0201_enable_certificate_authority_council
Start using CertificateAuthorityCouncil in CertificatePinner.
2016-02-01 21:48:14 -05:00
jwilson
e121ed1ad2 Start using CertificateAuthorityCouncil in CertificatePinner.
The wiring is definitely a bit more awkward than I would like. The
CertificateAuthorityCountil is a non-public class, and this change
sneaks an instance into the CertificatePinner that couples it to
the OkHttp client's SSLSocketFactory.

A nicer solution is to expose CertificateAuthorityCouncil as a public
API type, and add it to Address.java. Unfortunately that's currently
pretty awkward, especially because I'm not ready to commit to the
name CertificateAuthorityCouncil or its API.

Closes: https://github.com/square/okhttp/issues/1699
2016-02-01 20:02:07 -05:00
Jake Wharton
bf99c5e51a Merge pull request #2304 from square/jwilson_0130_ca_thingy
New CertificateAuthorityCouncil class to normalize certificate chains.
2016-02-01 19:54:36 -05:00
jwilson
18b2660873 New CertificateAuthorityCouncil class to normalize certificate chains.
The goal of this is to get the root CA certificate into the certificate
chain, so that it can be considered by the certificate pinner. The work
to integrate CertificateAuthorityCouncil with CertificatePinner will
come in a follow-up PR.

See: https://github.com/square/okhttp/issues/1699
2016-01-31 14:10:15 -05:00
Jesse Wilson
a2c1b971c4 Merge pull request #2302 from dave-r12/request-timeout-response
Handle 408 responses by retrying the request
2016-01-30 22:35:35 -05:00
Dave Roberge
8595234596 Handle 408 responses by retrying the request 2016-01-30 10:49:28 -05:00
Jesse Wilson
9df2224a03 Merge pull request #2299 from NightlyNexus/master
Fix throwing with HTTP2 unknown settings frame id
2016-01-29 20:32:55 -05:00
Eric Cochran
80b0bf4aa4 Fix throwing with HTTP2 unknown settings frame id 2016-01-29 14:13:32 -08:00
Jesse Wilson
38ddfedf09 Merge pull request #2293 from mreichelt/2292-okhttpclient-final
#2292 removed final from OkHttpClient
2016-01-28 15:53:28 -05:00
Marc Reichelt
425167afcb #2292 removed final from OkHttpClient 2016-01-28 18:28:47 +01:00
Jesse Wilson
5d2bc19113 Merge pull request #2286 from nxtstep/master
Update README.md -> Mockito moved to Github
2016-01-27 07:52:14 -05:00
nxtstep
6a79c3223c Update README.md -> Mockito moved to Github 2016-01-27 13:46:30 +01:00
Jake Wharton
7e9d190aba Merge pull request #2285 from square/jwilson_0127_extract_trust_manager
Teach OkHttp to lookup the X509TrustManagerFactory.
2016-01-27 01:00:35 -05:00
jwilson
a7d3396047 Teach OkHttp to lookup the X509TrustManagerFactory.
Right now there's problems with our ability to confirm certificate pins with
root certificates because we don't actually know which certificate authority
was used.

This unblocks that work.

This code is particularly fragile and gross. There's no API to get the
TrustManager from an SSLSocketFactory. We can potentially change the way
that we compute the initial SSLSocketFactory, but this approach is most
general.

This is motivated by https://github.com/square/okhttp/issues/1699
2016-01-27 00:31:15 -05:00
Jesse Wilson
8cefc2707c Merge pull request #2275 from chadbrubaker/urlfilter
Add basic URLFilter for HttpURLConnection
2016-01-26 21:09:49 -05:00
Chad Brubaker
2b1f9a20ba Add basic URLFilter for HttpURLConnection
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.
2016-01-26 09:47:08 -08:00
Jake Wharton
9ddcf9dfec Merge pull request #2276 from square/jwilson_0123_migrate_more
Create request/response API tests to match some URLConnectionTest tests.
2016-01-24 01:32:47 -05:00
jwilson
561613d579 Create request/response API tests to match some URLConnectionTest tests.
This is more work towards being able to later delete HttpURLConnectionImpl
without losing test coverage.

Also do some test cleanup.
2016-01-23 19:12:33 -05:00
Jake Wharton
9920c57e7a Merge pull request #2256 from square/jwilson_0116_stab_http_url_connection
Migrate some tests off of OkUrlFactory.
2016-01-16 17:49:11 -08:00
Jesse Wilson
f546b83678 Merge pull request #2255 from dave-r12/unsupportedcharset-httplogging-interceptor
Handle UnsupportedCharsetException in HttpLoggingInterceptor
2016-01-16 20:09:31 -05:00
jwilson
35b195abfa Migrate some tests off of OkUrlFactory.
Call is the future.
2016-01-16 20:06:56 -05:00
Jesse Wilson
9708df207f Merge pull request #2253 from dave-r12/gson-recipe-close-body
Updated gson recipe to close response body.
2016-01-16 18:54:28 -05:00
Dave Roberge
fc238a225d Handle UnsupportedCharsetException in HttpLoggingInterceptor 2016-01-16 15:32:09 -05:00
Dave Roberge
0f4d824418 Updated gson recipe to close response body. 2016-01-16 13:52:53 -05:00