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

494 Commits

Author SHA1 Message Date
Jesse Wilson
47829d8a60 Merge pull request #307 from narayank/master
Upstream changes made directly to AOSP.
2013-09-02 08:57:23 -07:00
Narayan Kamath
155a516b54 Upstream changes made directly to AOSP.
This change is a combination of 4 separate commits
to fix various bugs observed during android platform
testing.

https://android-review.googlesource.com/#/c/63781/
--------------------------------------------
Allow certificate inspections after connect.

We don't have to wait for the request to be sent
before allowing inspection of SSL certs. They can be
inspected as soon as the connection is established.

Fixes CTS test UrlConnectionTest#testInspectSslAfterConnect

https://android-review.googlesource.com/#/c/63821/
---------------------------------------------
Respect read timeout on recycled connections.

Partial fix for CTS test : URLConnectionTest#testGetKeepAlive.

https://android-review.googlesource.com/#/c/63782/
-----------------------------------
Fix HttpUrlConnection#isUsingProxy.

The earlier implementation disregarded what the
ProxySelector had to say. We now query the selected
route (if one has been established).

Fixes compatibility test:
HttpURLConnectionTest#testUsingProxySelector

https://android-review.googlesource.com/#/c/63872/
--------------------------------------------
Don't support anything other than Basic auth.

We should disregard authentication schemes other than
"Basic" and let clients handle them themselves.

The java Authenticator API gives us a user name and
password combination, but we can't know how to format
that information for any scheme other than basic.

Historically:

The JB implementation responds to challenges from an
arbitrary scheme "X" by sending a header with scheme
"X" but formatted like the "Basic" scheme.

The current implementation responds to challenges from
an arbitrary scheme "X" by sending a header with scheme
"Basic" and formatter like the "Basic scheme".

Partial fix for test cases in URLConnectionTest:
- testAuthenticateWithCommaSeparatedAuthenticationMethods
- testAuthenticateWithMultipleAuthenticationHeaders
2013-09-02 14:43:30 +01:00
Jesse Wilson
dd82416bc5 Merge pull request #301 from levelup/disk-garbage
When invalid sizes are used to initialize the ArrayList
2013-08-29 08:29:31 -07:00
Steve Lhomme
18b73c180c Merge branch 'master' of https://github.com/square/okhttp into disk-garbage 2013-08-29 17:18:00 +02:00
Steve Lhomme
638ae21c7a safer check for invalid values, without catching OOM 2013-08-29 17:17:24 +02:00
Jake Wharton
3695902587 Merge pull request #302 from square/jwilson/old_bad_cache_responses
Continue to read old bad cache responses.
2013-08-28 23:18:36 -07:00
jwilson
1a824f3c64 Continue to read old bad cache responses. 2013-08-28 23:11:05 -07:00
Steve Lhomme
3b83a3ba3e When invalid sizes are used to initialize the ArrayList, don't crash with an uncaught exception 2013-08-28 17:03:58 +02:00
Jesse Wilson
eaf806a1be Merge pull request #299 from square/jwilson/hpack
Implement HPACK, HTTP header compression.
2013-08-27 07:26:38 -07:00
jwilson
5663f815af Implement HPACK, HTTP header compression. 2013-08-27 07:25:05 -07:00
Jake Wharton
6097735fde Merge pull request #297 from square/jwilson/post_to_get
Drop body headers when redirected from POST to GET.
2013-08-24 18:25:48 -07:00
jwilson
a948ffce1e Drop Content-Length when redirected from POST to GET.
https://github.com/square/okhttp/issues/296
2013-08-24 14:11:15 -04:00
Jake Wharton
ca7d09b4e8 [maven-release-plugin] prepare for next development iteration 2013-08-23 23:19:52 -07:00
Jake Wharton
4eb81fee1f [maven-release-plugin] prepare release parent-1.2.1 parent-1.2.1 2013-08-23 23:19:48 -07:00
Jake Wharton
e0d360e98c Update change log with an additional fix description. 2013-08-23 22:52:44 -07:00
Jake Wharton
4ed57b92fb Prepare 1.2.1 release. 2013-08-23 22:50:01 -07:00
Jake Wharton
41997f3f96 Merge pull request #295 from square/jw/switch-optional
Switch NPN from optional to provided.
2013-08-23 22:48:17 -07:00
Jake Wharton
64b257183f Switch NPN from optional to provided.
Optional dependencies get included in the fat jar but are not transitive. Provided dependencies do NOT get included in the fat jar and are also not transitive.

I believe the former is a bug in the Maven assembly plugin so the latter case is used as a workaround.
2013-08-23 14:04:36 -07:00
Jesse Wilson
350c1f7780 Merge pull request #289 from levelup/double-negative
the numberOfPairs may not be negative when numberOfPairs*2 is negative
2013-08-20 16:46:21 -07:00
Steve Lhomme
787ec360de the numberOfPairs may not be negative when numberOfPairs*2 is negative 2013-08-20 09:10:19 +02:00
Jesse Wilson
801cd34d48 Merge pull request #287 from square/jwilson/read_frames
Read HTTP/2.0 frames and error codes.
2013-08-19 11:10:13 -07:00
jwilson
6e382aa9b8 Read HTTP/2.0 frames and error codes.
This introduces a new ErrorCode class that identifies
codes for HTTP/2.0, SPDY/3 RST codes, and SPDY/3 GO_AWAY
codes.
2013-08-19 14:09:34 -04:00
Jesse Wilson
540a885043 Merge pull request #283 from square/jwilson/hide_more_flags
Hide more flags from SPDY APIs.
2013-08-15 04:37:42 -07:00
jwilson
2f31d7122d Hide more flags from SPDY APIs.
Flags are not portable between SPDY/3 and HTTP/2.0,
so hide them in the reader & writer code.

Also rename SpdyReader to FrameReader and SpdyWriter to
FrameWriter. Other classes will be renamed as they become
independent of the underlying protocol.
2013-08-15 00:29:49 -04:00
Jake Wharton
bb5d91ab4f Merge pull request #280 from square/jwilson/push_flags
Push stream flags into Spdy3.
2013-08-14 13:38:32 -07:00
jwilson
39c0d7d563 Push stream flags into Spdy3.
Previously flags were being interpretted in SpdyConnection
and SpdyStream. This won't work for HTTP/2.0, which has its
own flag setup.
2013-08-14 07:25:25 -04:00
Jesse Wilson
edf6173c37 Merge pull request #279 from lingmingyb/length0
spdy 3 support length 0 header value
2013-08-14 04:14:15 -07:00
lingming
d3a92ff9d5 spdy 3 support length 0 header value 2013-08-14 11:52:54 +08:00
Jake Wharton
5b076fbe4a Add '0' to version number. 2013-08-12 11:40:12 -07:00
Jake Wharton
6998bf3b87 Fix changelog formatting. 2013-08-12 11:38:45 -07:00
Jake Wharton
1b0eee78f7 Merge branch 'master' of https://github.com/square/okhttp 2013-08-12 11:37:47 -07:00
Jake Wharton
993719684d Fix change log formatting. 2013-08-12 11:37:41 -07:00
Jake Wharton
83e77ea310 Merge pull request #277 from square/jwilson/http2_or_spdy3
Support multiple variants of the SPDY protocol.
2013-08-12 00:09:56 -07:00
Jake Wharton
db3b3f4d2a [maven-release-plugin] prepare for next development iteration 2013-08-12 00:01:30 -07:00
Jake Wharton
f7699d9243 [maven-release-plugin] prepare release parent-1.2.0 parent-1.2.0 2013-08-12 00:01:26 -07:00
Jake Wharton
f6ec6f74ba Add jar-with-dependencies for the main artifact. 2013-08-11 23:55:03 -07:00
Jake Wharton
bc3aa64462 Revert "[maven-release-plugin] prepare release parent-1.2"
This reverts commit ad928c668d.
2013-08-11 23:45:35 -07:00
Jake Wharton
490019163f Update checkstyle stuffs. 2013-08-11 23:43:03 -07:00
Jake Wharton
9ddc3d75de Only exclude Javadoc from 'internal' package in the main artifact. 2013-08-11 23:42:55 -07:00
Jake Wharton
542a2912b2 Eleven. 2013-08-11 20:21:05 -07:00
jwilson
21dc92f967 Support multiple variants of the SPDY protocol.
This behavior-free refactoring makes the first baby steps towards
supporting HTTP/2.0. It adds indirection on the framing layer so
we can frame either using SPDY/3's syntax or HTTP/2.0's.
2013-08-11 12:02:54 -04:00
jwilson
3626d69813 [maven-release-plugin] prepare for next development iteration 2013-08-11 10:30:12 -04:00
jwilson
ad928c668d [maven-release-plugin] prepare release parent-1.2 2013-08-11 10:30:06 -04:00
Jesse Wilson
e93511be34 Merge pull request #275 from square/jwilson/gzip_304
Test gzipped HTTP 304 response bodies
2013-08-10 13:52:05 -07:00
Jesse Wilson
17e54c0554 Merge pull request #276 from square/jwilson/prepare_okhttp_1_2
Prepare for OkHttp 2.0.
2013-08-10 13:51:46 -07:00
jwilson
e7d13c4802 Prepare for OkHttp 1.2.
Hide the async APIs (package-private), moving test code to
the same package as necessary.

Also write release notes.
2013-08-10 16:50:31 -04:00
jwilson
efc95d993f Test gzipped HTTP 304 response bodies 2013-08-10 08:42:14 -04:00
Jake Wharton
6e6b4152b7 Merge pull request #267 from square/jwilson/style
Use the OkHttp code style in MockWebServer
2013-08-05 16:28:29 -07:00
jwilson
d5ab35a272 Use the OkHttp code style in MockWebServer 2013-08-05 19:00:51 -04:00
Jesse Wilson
84e0b4875a Merge pull request #266 from square/jwilson/kill_mock_spdy_server
Teach MockWebServer SPDY.
2013-08-05 15:33:22 -07:00