1
0
mirror of https://github.com/square/okhttp.git synced 2026-01-21 03:41:07 +03:00
Commit Graph

952 Commits

Author SHA1 Message Date
Jesse Wilson
ae9dff7abe Add MockSink to the 1.5 branch. 2014-03-11 22:51:09 -04:00
Jesse Wilson
74f568dda9 More 1.5 changes.
(cherry picked from commit 087348c2c7)
2014-03-11 22:32:16 -04:00
Jesse Wilson
1eb23434ec Don't double pool on a conditional cache hit.
We were pooling the unused connection twice, and the pool was getting two
copies of the same connection. Bad consequences followed.

(cherry picked from commit 6191246d19)
2014-03-11 22:24:34 -04:00
Roberto Tyley
3d80c7b892 OkHttpClient should be treated as immutable once shared
...given that requirement, it's safe for many threads to call the
open() method concurrently to open their own connections.

(Manually cherry picked from b8f3a029d3, 8a0b263b7a, and 6b17f9edf3)
2014-03-11 16:48:04 -07:00
Jesse Wilson
2e71a040da Changelog updates.
(cherry picked from commit b169dc4c27)

Conflicts:
	CHANGELOG.md
2014-03-11 16:31:15 -07:00
Jesse Wilson
f943410f37 Fix problems with connection recycling and recovery.
We were incorrectly attempting to recycle connections terminated by the end
of a socket stream.

And we were keeping the 'Accept-Encoding: gzip' header on a recovered request,
which was suppressing our transparentGzip flag from getting the 'true' value
it requires.

(cherry picked from commit b0d4805f80)
2014-03-10 23:41:31 -07:00
Jesse Wilson
375c6f98d8 Merge pull request #631 from square/okhttp_15_jwilson_spdy_window_changes
fix #627: Merge SPDY settings when clear flag set.
2014-03-11 00:16:07 -04:00
Adrian Cole
8315663258 fix #627: Merge SPDY settings when clear flag set. Revert Settings.DEFAULT_INITIAL_WINDOW_SIZE. 2014-03-11 00:15:15 -04:00
Jesse Wilson
0d774185b6 Merge pull request #630 from square/okhttp_15_jwilson_0310_deflater
Fix problems with DeflaterSink.
2014-03-11 00:13:13 -04:00
Jesse Wilson
8c6162aaf1 Fix problems with DeflaterSink.
We weren't checking Deflater.needsInput() in the deflate loop. This is
necessary on the RI, which returns 0 even when a subsequent call will
deflate data.
2014-03-11 00:12:16 -04:00
Jake Wharton
523e9237d7 Merge branch 'okhttp_15' of https://github.com/square/okhttp into okhttp_15 2014-03-09 23:00:41 -07:00
Jake Wharton
8a320b19da Start change log. 2014-03-09 23:00:35 -07:00
Jake Wharton
3ab3444835 Merge pull request #622 from takke/okhttp_15_fix_for_android2_2
enable to work on android 2.2
2014-03-09 22:56:32 -07:00
Jesse Wilson
d52bef7615 Use the peer's settings for outgoing window updates.
(cherry picked from commit 818d17e365)
2014-03-09 22:46:58 -07:00
takke
933c900d52 enable to work on android 2.2 2014-03-09 13:12:19 +09:00
Jake Wharton
bf77f22b45 [maven-release-plugin] prepare for next development iteration 2014-03-07 14:59:54 -08:00
Jake Wharton
aebb2c4afd [maven-release-plugin] prepare release parent-1.5.0 parent-1.5.0 2014-03-07 14:59:51 -08:00
Jake Wharton
dc1d04b60e Build setup tweak to work around release plugin bug.
http://jira.codehaus.org/browse/MRELEASE-812
(cherry picked from commit c8638813ff)
2014-03-07 14:47:04 -08:00
Jake Wharton
acd9c8f6e5 Update change log a bit. 2014-03-07 14:34:33 -08:00
Jake Wharton
255edbee83 Merge pull request #614 from square/okhttp_15_jwilson_fix_teh_poms
Fix poms for 1.5.
2014-03-07 12:53:03 -08:00
Jesse Wilson
b5d620096d Fix poms for 1.5. 2014-03-07 12:45:53 -08:00
Jake Wharton
33b76c0d78 Merge pull request #613 from square/okhttp_15_version
Use the 1.5 version in the 1.5 branch.
2014-03-07 11:36:37 -08:00
Jesse Wilson
f76adcbb91 Use the 1.5 version in the 1.5 branch. 2014-03-07 11:35:35 -08:00
Jake Wharton
cf41984186 Merge pull request #612 from square/okhttp_15_jwilson_strip_20_apis
Strip 2.0 APIs from the 1.5 branch.
2014-03-07 11:23:32 -08:00
Jesse Wilson
8bc100eaad Strip 2.0 APIs from the 1.5 branch. 2014-03-07 11:16:41 -08:00
Jesse Wilson
7b106923e0 Merge pull request #602 from square/adrian.567.slow-network-tests
Test case for read timeout granularity
2014-03-06 16:42:08 -08:00
Jesse Wilson
fb454365c2 Merge pull request #610 from square/adrian.delete-body
Allow DELETE Request Body, Ensure Sane Behavior.
2014-03-06 16:40:34 -08:00
Adrian Cole
f0941ff6ea fix #605: Allow DELETE Request Body, Ensure Sane Behavior. 2014-03-06 15:58:28 -08:00
Adrian Cole
cb2d297ae2 Test case for #567: read timeout granularity. 2014-03-06 15:56:31 -08:00
Adrian Cole
26b5f35718 Update MWS to pay attention to throttling for SPDY streams. 2014-03-06 15:56:31 -08:00
Adrian Cole
5e1c5f5f3e Merge pull request #601 from square/jwilson_0305_cache_access
Restore support for ResponseCache.setDefault().
2014-03-06 09:00:53 -08:00
Jesse Wilson
7a1c67a82f Merge pull request #609 from nfuller/IOExceptionOnClose2
Make HttpURLConnection streams throw IOException after close()
2014-03-06 08:24:30 -08:00
Jesse Wilson
57c221ede3 Merge pull request #604 from nfuller/ResponsePropertiesRequestLine
Removing requestLine from HttpURLConnection.getRequestProperties()
2014-03-06 08:20:14 -08:00
Neil Fuller
129c937fb3 Make HttpURLConnection streams throw IOException after close()
This is to revert to prior behavior found in earlier releases:
OkHttp changed to throw IllegalStateException.

HttpEngine has also been changed to explicitly close the request
body on disconnect() to ensure that these exceptions are thrown
at the expected moment (e.g. on write() on a closed, buffered
stream).

Additional close() checks have been added to okio classes and
tests have been added. The tests are probes for interesting
examples, not complete.
2014-03-06 11:54:33 +00:00
Neil Fuller
fbbc6942cf Removing requestLine from HttpURLConnection.getRequestProperties()
This was breaking an Android test and appears not to be part of the spec for
HttpURLConnection.

To fix the test fully another change was required to add additional headers
passed to the CookieHandler.

Also added are some tests ported over from Android that test
CookieHandler/CookieManager and improve coverage of this area.
2014-03-06 09:13:41 +00:00
Jesse Wilson
fda2265d78 Merge pull request #603 from square/adrian.readSendsWindowUpdate-deflake
Do not enforcing order of window update frames
2014-03-05 10:13:31 -08:00
Adrian Cole
8fa4242d02 Attempt to deflake readSendsWindowUpdate by not enforcing order of window update frames. 2014-03-05 09:39:30 -08:00
Jesse Wilson
8f035fc347 Restore support for ResponseCache.setDefault(). 2014-03-05 09:27:29 -08:00
Jesse Wilson
74027a4e0b OkHttp 1.5 changelog. 2014-03-04 23:13:12 -08:00
Adrian Cole
01d15a6ff2 Merge pull request #597 from square/jwilson_0304_kill_some_dead_code
Kill some dead code on source and sink closing.
2014-03-04 21:08:26 -08:00
Adrian Cole
f77bfc0a77 Merge pull request #598 from square/adrian.fix-byteStringLength
incorrect processing of variable-length quantity in http/2 hpack
2014-03-04 21:07:42 -08:00
Jesse Wilson
788a802579 Kill some dead code on source and sink closing. 2014-03-04 21:03:27 -08:00
Adrian Cole
8cf085f404 Merge pull request #599 from square/adrian.pushobserver-nits
Address PushObserver feedback
2014-03-04 21:01:14 -08:00
Adrian Cole
5f7c3bf39c fix #596: incorrect processing of variable-length quantity in http/2 hpack. 2014-03-04 21:00:32 -08:00
Adrian Cole
88c95dd4f1 Merge pull request #594 from square/jwilson_0304_delegating_https_url_connection
Share code between delegating HttpsURLConnections.
2014-03-04 20:59:22 -08:00
Adrian Cole
1ab398fb93 Address PushObserver feedback. 2014-03-04 20:53:13 -08:00
Jesse Wilson
60ca88944f Share code between delegating HttpsURLConnections. 2014-03-04 16:23:16 -08:00
Jesse Wilson
11aa925a54 Merge pull request #595 from square/jw/no-more-fat-jar
Remove creation of 'fat' jar.
2014-03-04 12:03:16 -08:00
Jake Wharton
cf63fcc48a Remove creation of 'fat' jar.
Since the 'okhttp-protocols' module no longer exists we do not need to create this.
2014-03-04 10:55:48 -08:00
Jesse Wilson
cc8e8664df Merge pull request #574 from nfuller/ResponseCacheAdapter
Adding ResponseCacheAdapter.
2014-03-04 08:07:46 -08:00