History log of /external/okhttp/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
be40c8024c0572878c55d2e032f3cbb6ef85ccd9 10-Feb-2015 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
75a7afac9b6b5866cde46c3d3158227391175701 09-Feb-2015 Neil Fuller <nfuller@google.com> Reduce flakiness of OkHttp tests

Copy of the test changes from a pending upstream
pull-request:
https://github.com/square/okhttp/pull/1348

----

Android has been receiving reports of some tests being flaky
on what are probably lower-spec devices.

This introduces delays into tests where sockets are being
poisoned after the entire response body has been written to
them *and* where there are follow-up requests.

Bug: 18953235
Change-Id: Ic2d281a3faad6082819ef6d57b3489bcd6dbd474
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
12cf1b0427f695ec832f1112f8ba419077e5b5aa 22-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
342d21a7eb7d28ae132c43a4ab8353cbedff9e01 11-Dec-2014 Neil Fuller <nfuller@google.com> Fix DisconnectTest for devices with large socket buffers

Similar to commit e3bfefb13c93006a2fbe22363572a314f6c18659
but for DisconnectTest. The buffer sizes are large on some
devices so the expectation that they take a lot of time to
stream data is invalid because they just write into the
buffers.

Bug: 18703696
Change-Id: I6127b044bf7fefc192f577d0b035deacbc54dd5f
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/DisconnectTest.java
9359e127d5a1eb6cd4fe6979485ff79476761a30 02-Dec-2014 Neil Fuller <nfuller@google.com> Avoid a reverse DNS-lookup for a numeric proxy address

When the proxy is specified as an IP address the RouteSelector
would force a reverse-lookup. This can introduce extra latency
when the DNS is slow or missing. It also then turns the name
back into a set of IPs, which may result in the original IP
address not being given priority.

This is upstream commit:
https://github.com/square/okhttp/commit/9acd5e7b54fb55f62a5dd16865c30787dfba4c8b

Bug: 18567569
Bug: 18327075
(cherry picked from commit 797fdc6cc6bf16372e9464f189b535148f944ce9)

Change-Id: I52b4049095acafd2367530532d8cad7d75b6809a
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
dd6543e08d4d139de53b51753ceb2dffea93beac 10-Dec-2014 Neil Fuller <nfuller@google.com> Merge "Avoid a reverse DNS-lookup for a numeric proxy address" into lmp-mr1-dev
2ed0095a4f0da2f0bbe75b9d139419ce75afaa25 02-Dec-2014 Neil Fuller <nfuller@google.com> Avoid a reverse DNS-lookup for a numeric proxy address

When the proxy is specified as an IP address the RouteSelector
would force a reverse-lookup. This can introduce extra latency
when the DNS is slow or missing. It also then turns the name
back into a set of IPs, which may result in the original IP
address not being given priority.

This is upstream commit:
https://github.com/square/okhttp/commit/9acd5e7b54fb55f62a5dd16865c30787dfba4c8b

Bug: 18567569
Bug: 18327075
(cherry picked from commit 797fdc6cc6bf16372e9464f189b535148f944ce9)

Change-Id: I52b4049095acafd2367530532d8cad7d75b6809a
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
89b6cc5af0c895e3ac48318ac980950ae8b90ac4 03-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
afcb40207ecf7fc935b40a76cd0c039d5e576441 02-Dec-2014 Neil Fuller <nfuller@google.com> am 0f102f51: Add further handling for when a CONNECT incorrectly returns a body.

* commit '0f102f51711ecc2ef9f25cbbad2148ee97bdb6cb':
Add further handling for when a CONNECT incorrectly returns a body.
0f102f51711ecc2ef9f25cbbad2148ee97bdb6cb 05-Nov-2014 Neil Fuller <nfuller@google.com> Add further handling for when a CONNECT incorrectly returns a body.

Before the change:
If a proxy returns a body and some of the body bytes have
already been buffered then an IOException is thrown.
If the body bytes have not been buffered then the handshake will
fail due to the presence of bytes where the Server HELLO is
expected, typically with some kind of SSLHandshakeException.

After the change:
The body bytes are consumed to ensure consistent behavior. The
handshake will then take place.

History:
This is an unusual case that would occasionally cause failures
on Android when a ResponseCache was installed. Android introduced
a patch to prevent CONNECT responses being cached. Since then,
OkHttp has changed the code and probably fixed the issue via
other means. The Android test remained and would sometimes
experience one exception, sometimes another, depending on the
state of the buffer.

If the presence of a body is a possibility it would be nice
to deal with it consistently and deterministically.

The motivation for this change is to make an Android test
equivalent to the one added here behave consistently and in a
way that doesn't involve connection fallback.

The only risk with this change is if a proxy is incorrectly
reporting the content length: this might lead to blocking on
the body read/skip (as OkHttp would probably do elsewhere if a
server mis-reports a content-length). This may make connections
to "bad" proxies slightly more reliable.

Bug: 6754912
Bug: 18575971

(cherry picked from commit 007b88ad6df622a2e5daacce604637d006ed6212)

Change-Id: Icf9e17a26dd2b1c4024935dfae3e87b2654a220e
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
6a8df5eff05f78a3e0d809a32856fd436c03c9d3 02-Dec-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
6257f0c1c5e6e94d446051f856207782d7188c43 01-Dec-2014 Neil Fuller <nfuller@google.com> Fixes to ConnectionPool noticed during upstream review

Suggested by Jake Wharton. Minor documentation fixes, plus:

The pool should explicitly re-enter DRAINING state if a
connection is added to a drained pool. This state change was
missing.

The pool was implicitly in DRAINING while the pool still had
connections in it, so the pool would still drain.
However, adding back connections to a pool that was DRAINING
but still incorrectly marked as DRAINED would cause a
new runnable to be scheduled. This would cause the queue of
scheduled items to grow unnecesarily and the clean up thread
would continue to operate longer than necessary.

Bug: 18369687
Change-Id: I2228b33f8240890d3736da1a21c8cc852fceec25
khttp/src/main/java/com/squareup/okhttp/ConnectionPool.java
1b43681e3895dae48746cace65a1610c891ff89c 21-Nov-2014 Alex Klyubin <klyubin@google.com> am 466ef072: am db7edbf1: am 200d28a2: am e82a7960: Fix a bug in OkHostnameVerifier wildcard handling.

* commit '466ef072d672d6c5cce3da222f76828427680e53':
Fix a bug in OkHostnameVerifier wildcard handling.
8040b3e5001ca29a3474efca7165b55d896f9e64 20-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to lmp-mr1-dev
00407a766d802a365a2025add7ce89be46548da4 20-Nov-2014 Neil Fuller <nfuller@google.com> Merge "Fix for a socket leak in OkHttp on Android" into lmp-mr1-dev
f3bcd0c7f0741b277b5d58f294df6201dafd45e8 19-Nov-2014 Neil Fuller <nfuller@google.com> Fix for a socket leak in OkHttp on Android

When the preferred Android network changes from
cell -> wifi or wifi -> cell the HTTP connection
pool in use is abandoned to avoid reuse of
connections on the old network. This was added
in commit 8bced3e.

The design for the connection pool was such that
continuous use of the connection pool was required to
clean up idle / expired connections. If a connection
pool becomes idle (as when it is dereferenced on a
network change) it is possible for some connections
to remain in the pool indefinitely.

After the preferred network change, because the old
connection pool was no longer referenced the pool
would be garbage collected and Android's "Strict Mode"
would complain about sockets not being closed.

The only existing way to avoid this was to call
"evictAll()", which would have had issues when a
large number of connections were returned to the pool
after evictAll() was called. It also wouldn't work
for SPDY connections which are shared but not reference
counted, which makes knowing whether it is safe to
close them difficult. SPDY is not enabled on Android
by default and so that may have been safe to ignore.

This fix tries to keep the existing cleaning behavior
intact to avoid introducing new bugs or new thread
behavior that might impact battery life. It adds a
new mode to the pool for "draining", which handles
cleaning up any existing entries in the pool and any
added after the pool has been placed into draining
mode.

The drainModeRunnable introduced serves two purposes:

1) While scheduled / executing, it pins the connection
pool in memory to avoid it being garbage collected.
2) It continues to close connections (safely) until the
pool is empty.

If a connection is then added back to the pool the
drainModeRunnable is restarted.

Bug: 18369687
(cherry picked from commit ff345b6c0ffcc691e4c3c594f8a222cf81bb325c)

Change-Id: I4e9e530f8e7acedf4b9a806237c8769a10671feb
ndroid/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java
khttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp/src/main/java/com/squareup/okhttp/ConnectionPool.java
466ef072d672d6c5cce3da222f76828427680e53 19-Nov-2014 Alex Klyubin <klyubin@google.com> am db7edbf1: am 200d28a2: am e82a7960: Fix a bug in OkHostnameVerifier wildcard handling.

* commit 'db7edbf1f7713d5170a8132c0d1a3c43f90f55e5':
Fix a bug in OkHostnameVerifier wildcard handling.
db7edbf1f7713d5170a8132c0d1a3c43f90f55e5 19-Nov-2014 Alex Klyubin <klyubin@google.com> am 200d28a2: am e82a7960: Fix a bug in OkHostnameVerifier wildcard handling.

* commit '200d28a247d616dc6a67c9c3bbb289f8c130f220':
Fix a bug in OkHostnameVerifier wildcard handling.
200d28a247d616dc6a67c9c3bbb289f8c130f220 19-Nov-2014 Alex Klyubin <klyubin@google.com> am e82a7960: Fix a bug in OkHostnameVerifier wildcard handling.

* commit 'e82a7960ac9057798c6e2b9717f8e7f191b8022d':
Fix a bug in OkHostnameVerifier wildcard handling.
e82a7960ac9057798c6e2b9717f8e7f191b8022d 19-Nov-2014 Alex Klyubin <klyubin@google.com> Fix a bug in OkHostnameVerifier wildcard handling.

Wildcard domain name patterns of the form *.remainder are supposed to
match domain names that exactly match the remainder. Due to a bug,
the match was not exact but rather a prefix match: domain names
starting with the remainder would match too.

This CL fixes the issue.

(cherry picked from commit a03ec4ced2b11f9eae6cbeeedb1db2b1b29fafb1)

Bug: 18432707
Change-Id: Ie40b71a26df1ac2a972341e7b3b40dd9cf38e8b1
rc/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
rc/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
a03ec4ced2b11f9eae6cbeeedb1db2b1b29fafb1 19-Nov-2014 Alex Klyubin <klyubin@google.com> Fix a bug in OkHostnameVerifier wildcard handling.

Wildcard domain name patterns of the form *.remainder are supposed to
match domain names that exactly match the remainder. Due to a bug,
the match was not exact but rather a prefix match: domain names
starting with the remainder would match too.

This CL fixes the issue.

Bug: 18432707
Change-Id: I2639ff51cabcbd395d4f30a9c69f9895738e0acf
khttp-tests/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
khttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
4ff7779665bf752bc3115dd97b3e6d88e4131b47 08-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
d8cbe90f7763ffb4bcbb6db79333f129bd93ce48 06-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
2c6183aac5d26644ab373cd927036ea12dfdd4db 05-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
f14ecbb0eb0ff094f6ef41575c76965f2ffaf52e 04-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
2d635ff0bc301430475ebfb4a7d8f24c4e19ee04 03-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
f1e46a9e7abccb8677c2f4fa154a546c10448215 02-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
a61f7cd5d0454d6460e282b4d4a7c3e5cd51c7ca 01-Nov-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
f6ea96906cc4d1cfa664f798d35f54c5d27b3305 30-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
eba94ca29f3d6a02b44d0c9d12b3d33afabc4f78 29-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec5d718cebf7a
c9d310414b1ee923b2d2caa5366fa03519cd1c94 28-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8cdfc1007818eec034fd6f547425cfda7369ed49
cc168fec727bd90ca6582e21a59ec5d718cebf7a 27-Oct-2014 Narayan Kamath <narayan@google.com> Be consistent about host names in RouteSelector.

Use the host specified by the address, and not URI.getHost().

bug: 18023709

(cherry picked from commit b576bbf122893c6d0ea2846378b9136631784faf)

Change-Id: I013bb48d7ab51c62a19ecfb3063efb7b0c423b1e
khttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
129b810029a3454595a29285460cfa7aba63c619 27-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 602d5e4cfdbd0bad91e7872837f95aff5b461595
8cdfc1007818eec034fd6f547425cfda7369ed49 16-Oct-2014 Neil Fuller <nfuller@google.com> Fixing SNI, ALPN, NPN support for some cases

Fixing the case where the socket implementation is not in the package or
with the exact name we expect. We now use something like duck-typing.

Bug: 18014455
(cherry pick from commit 565c2ad69684ef7c23b5aaa3b7f0c7363cef6bd7)

Change-Id: Ib018209c171e2b18d5f4ee2c4f364778f5e239dc
ndroid.mk
ndroid/main/java/com/squareup/okhttp/internal/OptionalMethod.java
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
ndroid/test/java/com/squareup/okhttp/internal/OptionalMethodTest.java
ndroid/test/java/com/squareup/okhttp/internal/PlatformTest.java
602d5e4cfdbd0bad91e7872837f95aff5b461595 03-Apr-2014 Jesse Wilson <jwilson@squareup.com> New disconnect strategy.

Support asynchronous disconnects by breaking the socket only, which
should cause the thread using that socket to trigger clean-up.

Upstream commit: https://github.com/square/okhttp/commit/9c302131491d05a4ca0209ef21770592c01f76fa

Bug: 18083851
(cherry picked from commit 87ed7244fb53ae2bac9f23c033bbd5f23ac269f8)

Change-Id: Ia16147cb84eb9e73af48a2771ef734fbb7baa8f5
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/DisconnectTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/Transport.java
432a69b3b825f5393a2fa8eee7670278fb2212c9 26-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
1a27c5c4320301bb0d0559a02ec21df3d4d94964 25-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
c5e933042c76c69c8604ec942454444d628b6f57 23-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
b3197d18ff9173162287c2f160f6a3e33b62e00c 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
6bc21f2a855a88a646965ddbeb1b00f4831c014b 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
e724f19f5ee90e648e1146202ee21d5c7335ff80 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
b6d26ec347aa1db57d05d4a0515945f2b3e4cb32 19-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
87658e5f65810ae9aebad49ba8e141f67431556c 18-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
5456981822fddff8788bbe8b09f7a4f691d66550 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
6fea069688ff0e56de12e669f3f4748674bca880 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949d56e8908356
5e82edea00999f080d67b851d5949d56e8908356 15-Oct-2014 Kevin Ma <kma@google.com> am 3c0f4a28: (-s ours) Revert "DO NOT MERGE Fixing broken OkHttp CTS test"

* commit '3c0f4a28c5d5a98e15f9e9fc6a7c03bf459d5e14':
Revert "DO NOT MERGE Fixing broken OkHttp CTS test"
3c0f4a28c5d5a98e15f9e9fc6a7c03bf459d5e14 15-Oct-2014 Kevin Ma <kma@google.com> Revert "DO NOT MERGE Fixing broken OkHttp CTS test"

This reverts commit 2c1270c0bfe9cfdc8a96f705569a2fa5ef5c3dcb.
khttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
196d116bd937d3c0e688dc8b977ac2ce80260b7e 15-Oct-2014 Neil Fuller <nfuller@google.com> am 2c1270c0: (-s ours) DO NOT MERGE Fixing broken OkHttp CTS test

* commit '2c1270c0bfe9cfdc8a96f705569a2fa5ef5c3dcb':
DO NOT MERGE Fixing broken OkHttp CTS test
2c1270c0bfe9cfdc8a96f705569a2fa5ef5c3dcb 13-Oct-2014 Neil Fuller <nfuller@google.com> DO NOT MERGE Fixing broken OkHttp CTS test

Bug: 17962997
Bug: 17750026
Bug: 17976702
Change-Id: Icbc48a8c30857b3afb0175ac4b341626d4b3dfe8

Conflicts:
okhttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
4705c9a082073710a399b01cfb2f24ad45b7a8c4 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f010a424268befb89c84a69b4dfe3f8be653d407
95d1a1316ee04d39d55102e65daaacb97f5d42f8 13-Oct-2014 Neil Fuller <nfuller@google.com> Fixing broken OkHttp CTS test

Bug: 17962997
Bug: 17750026
Change-Id: Icbc48a8c30857b3afb0175ac4b341626d4b3dfe8
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
434d9532d74eb887345a5b60d0e2486b4d7f5b52 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to f010a424268befb89c84a69b4dfe3f8be653d407
a2b129f1d62d89b650e6e5589a94ee73f245445c 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 1602b29208bb574ca1847978eb3ba957ef938e66
7bf3146aac49a5ace56698348294ce7df8b20e51 11-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 1602b29208bb574ca1847978eb3ba957ef938e66
f010a424268befb89c84a69b4dfe3f8be653d407 10-Oct-2014 Neil Fuller <nfuller@google.com> am a44dc1ea: am 2b069b2d: am 798243ff: am 98488da3: am aefd3aaf: SCSV support

* commit 'a44dc1eaad12d824f7b6d67adf62780ce88c415c':
SCSV support
a44dc1eaad12d824f7b6d67adf62780ce88c415c 10-Oct-2014 Neil Fuller <nfuller@google.com> am 2b069b2d: am 798243ff: am 98488da3: am aefd3aaf: SCSV support

* commit '2b069b2d6e6081fd3314cf443d0e7648f1ac660d':
SCSV support
2b069b2d6e6081fd3314cf443d0e7648f1ac660d 10-Oct-2014 Neil Fuller <nfuller@google.com> am 798243ff: am 98488da3: am aefd3aaf: SCSV support

* commit '798243ff83baf3effd9c278473460a3e9f90d234':
SCSV support
798243ff83baf3effd9c278473460a3e9f90d234 10-Oct-2014 Neil Fuller <nfuller@google.com> am 98488da3: am aefd3aaf: SCSV support

* commit '98488da33afbd0d18147bc70ea2e2e15d913c596':
SCSV support
98488da33afbd0d18147bc70ea2e2e15d913c596 10-Oct-2014 Neil Fuller <nfuller@google.com> am aefd3aaf: SCSV support

* commit 'aefd3aaff8334d99f42cd8229e749e110aaf1d34':
SCSV support
1602b29208bb574ca1847978eb3ba957ef938e66 09-Oct-2014 Neil Fuller <nfuller@google.com> am 28018144: am 14b8a7ac: am c3f6560f: SCSV support

* commit '280181444f3340d8d3459ec9332bf87ae47b24a8':
SCSV support
280181444f3340d8d3459ec9332bf87ae47b24a8 09-Oct-2014 Neil Fuller <nfuller@google.com> am 14b8a7ac: am c3f6560f: SCSV support

* commit '14b8a7acd2faa1aba5a62e905102d3be28eaed92':
SCSV support
9d3876e29b6ce579e705ba734dd2b8f7ba8f31ea 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to e256f2c51cf406843a7ed0364399f79a63a085f6
14b8a7acd2faa1aba5a62e905102d3be28eaed92 09-Oct-2014 Neil Fuller <nfuller@google.com> am c3f6560f: SCSV support

* commit 'c3f6560f315a3161f22ca066dd53232881baee72':
SCSV support
c3f6560f315a3161f22ca066dd53232881baee72 07-Oct-2014 Neil Fuller <nfuller@google.com> SCSV support

This adds the TLS fallback SCSV token.

Bug: 17750026
(cherry-picked from commit e256f2c51cf406843a7ed0364399f79a63a085f6)

Change-Id: I9ca3e12a8a430e647bd5421fb6fee32dba360a8c
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
5582268dc88220aa26c4ae549235c10ad813fe94 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to e256f2c51cf406843a7ed0364399f79a63a085f6
aefd3aaff8334d99f42cd8229e749e110aaf1d34 07-Oct-2014 Neil Fuller <nfuller@google.com> SCSV support

This adds the TLS fallback SCSV token.

Bug: 17750026
(cherry-picked from commit e256f2c51cf406843a7ed0364399f79a63a085f6)

Change-Id: Icdbe6f896ce76b00c738a4df5d53e7b702524bc6
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
e256f2c51cf406843a7ed0364399f79a63a085f6 07-Oct-2014 Neil Fuller <nfuller@google.com> SCSV support

This adds the TLS fallback SCSV token.

Bug: 17750026
Change-Id: I3dfc3b0af6ede2d240218a667869be64d0a0268d
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
970f50bec7b782abaf1af8208595bc25dd4c83a3 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to e3bfefb13c93006a2fbe22363572a314f6c18659
5988a0dfd8baf584203b81672bb1a7e607ae4d73 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
e3bfefb13c93006a2fbe22363572a314f6c18659 06-Oct-2014 Neil Fuller <nfuller@google.com> Fix OkHttp test failure for fast devices

On a fast device the ThreadInterruptTest#interruptWritingRequestBody
would consistently fail.

The issue is probably a combination of socket buffering and the data
volume chosen by the test. The test was written to assume that
read-side throttling would prevent the writer from writing its data
within 500 millis. After ~500 millis the write thread would be
interrupted and the test would pass.

On a fast device the test would write all the test data
in ~ 125 millis and the test would fail. The interruption would then
trigger on a later test
(typically URLConnectionTest#authenticateWithGetAndTransparentGzip),
breaking that test as well.

If there is sufficient socket-level read/write buffering it is
possible the data being written will just fill the socket buffers
and the writer will terminate early. If the data to be written is
increased from 2 to 10 MB the test passes.

Bug: 17516838
Change-Id: I54b5de9527d9737e6c987b6a9c4f62578f4f8fb7
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ThreadInterruptTest.java
b97950155a074e0e8a2d7a87ea088fb7001f1b87 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
6319a849b4c7de3d66194caa5d02f965ca16eb2a 04-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
94d91940e07debed3ec9f9bf8d7ea4edc7c3f5da 02-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
8fe2037e327790ead79ba28209f1a9ad2640a670 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
2b6dfb90f218c4122d1648468173ba5a99168bfd 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
7e9d3c8e8f0f0932fee888126e230df9decd6e86 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
b3e94f3f957353fa66530059627902121d1be68b 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
3e6fa733ecfe67e1a330b2869a0633f9f570081a 27-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
7550957f3b708aebf348b85c8a3a3cb38ac3c058 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
f945b4da0a10bf5bced7e0e1cbc4d1f4c7dd1347 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
82049a498012b453ba3ddd8590781d43b1cb0bb6 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
f18b2563253cf6313925b3ced03b9595023429d5 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
1b10804ddf127542a8408a8e094bbfae87475cdc 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
337bec8853685177bf543b8525c762b9bec0dea4 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
9bd9842d063a0c11a1558c563209f52d4d731db2 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
9e89fc12150275841304dd326665acd964afe56b 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
9ec40e3b7e6e57cdbddfbf5578ebe6466d36edbc 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
d73791530265c5385a594cb52f78ce27917de1f0 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 29e1bbc9046d623d77ce97d074a0e51e178ae796
dfd112e7bf694b73ef32ccd54e2e8dddad80ed6a 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 8bced3e769d315a0a81b89de7a5282f1a85acbf7
29e1bbc9046d623d77ce97d074a0e51e178ae796 11-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 84f674f3abba1083e1efd94520d516036a3f0b6a
8bced3e769d315a0a81b89de7a5282f1a85acbf7 11-Sep-2014 Neil Fuller <nfuller@google.com> Alter Android's connection pool behavior on network config changes

Rather than clearing out and closing the shared connection pool
each time the network changes with evictAll() this ensures that
later Http(s)URLConnections will reference a new ConnectionPool
instance.

This is an improvement over the current implementation:
1) It is obviously non-blocking.
2) It ensures that connections for the old network config
and are currently in use are not put back into the shared
pool.

Change-Id: I7b62f2bbd306c932dfd8d0ff4fff236ec04405bf
Bug: 17314604
ndroid.mk
ndroid/main/java/com/squareup/okhttp/ConfigAwareConnectionPool.java
ndroid/main/java/com/squareup/okhttp/HttpHandler.java
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
ndroid/test/java/com.squareup.okhttp/ConfigAwareConnectionPoolTest.java
cdf396984606b5a181cee1d93f16367bf982e9a3 10-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to c19427fc6c8c1be67970437643c8fe90e328fc6c
84f674f3abba1083e1efd94520d516036a3f0b6a 03-Sep-2014 Neil Fuller <nfuller@google.com> external/okhttp changes to support connection pool flushing

When the preferred network / default network for a device
changes we must flush any pooled connections.

This change has a known issue which will be fixed in a
later commit: Any connections that are in use when
the pool is cleared can be put (back) into the pool after
evictAll(). This means those connections will continue to
reference the old preferred / default network.

Bug: 17314604
Change-Id: Icbe20db77922cdbe1d6965785de7ee59495044de
ndroid/main/java/com/squareup/okhttp/HttpHandler.java
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
c19427fc6c8c1be67970437643c8fe90e328fc6c 09-Sep-2014 Neil Fuller <nfuller@google.com> Enable android.net to reuse OkHttpClient creation logic

Pulling out static factory methods from HttpHandler and
HttpsHandler. android.net will call these to create
OkHttpClient instances which they can then further tweak
for their own purposes.

Bug: 17420465
Change-Id: Ib22e79ee3a2fec343dbf518d6f885b18997b0002
ndroid/main/java/com/squareup/okhttp/HttpHandler.java
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
636b63031c69ad44b2a04452269a3e72d64cbcbc 09-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
383ed065ab2d253b3c2b874f9f62a80e752d7361 08-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
c9984486523c845b7afaf761a76b733a91410307 07-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
32c7edf27d2d91b2f07d7b6919cf80cf786315ec 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to b3336cd618814e4b45f53527a0ce10a6d53f4422
35e17e6181f381a1e1010b85e37ded97c733bae6 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
b3336cd618814e4b45f53527a0ce10a6d53f4422 04-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
7fc3f8fe9d26ef79c71168260a51afbe31aa183d 03-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
f2a102f7b6036baf21793aab65fa00eb4ab61b91 02-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
eec16de9decf1908a90cf3d26fdfc0119535686f 01-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
0eca5e9f2958d91b3439dd831ea491cc38ea8a3d 31-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
a6b2c603699fda21e1deeb15d08449e11b10e524 27-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
46d6e39a04bc81fe5d0d7e7ab53b8750ac1a824e 26-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
113b7715de2df4affd52fd27ed47a467536a4f35 25-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
45940b1cbe68b7682c2d63d4e88093f240c9a5f0 24-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
aabcdcbf179198f8916b1caa7647c409adb2dd63 23-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
fd1f51f7475c937774ec62aa23ab797da4f0d519 21-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
3d6ec6a23f27b1e398ce36040edf9d29683263d1 20-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
82df6741d249a5cc45bad62395836972e59e63f4 19-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
5c96a77e979bbb35a15a7cd8ac5673adf986ab56 18-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
e956c8e6e772852ca6c35c0bd819f859ff4683db 17-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
3183bcfa498333dcde19beaa9d721e636e861f63 14-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
f63efc307be5dea0e6e19cc5bd53e82f3155b26b 13-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a7da17a472f66a9932e439ffc62610de2d9b8321
4f611325d2afd7a3e5c5325be05103bb5a905d0e 12-Aug-2014 Narayan Kamath <narayan@google.com> Fix NPE in Connection#close when socket == null.

This is a partial cherry-pick of the upstream commit
c26f9af0489869a9e1873ed5010c65f8464cff26.

bug: 16907112

(cherry picked from commit c2bb00c4a14c9929d9126c39aeda4cb24576ef3e)

Change-Id: I80e451ec1daf55b5ae5c3a76290cf48d5e3de559
khttp/src/main/java/com/squareup/okhttp/Connection.java
a7da17a472f66a9932e439ffc62610de2d9b8321 12-Aug-2014 Narayan Kamath <narayan@google.com> Fix NPE in Connection#close when socket == null.

This is a partial cherry-pick of the upstream commit
c26f9af0489869a9e1873ed5010c65f8464cff26.

bug: 16907112

(cherry picked from commit c2bb00c4a14c9929d9126c39aeda4cb24576ef3e)

Change-Id: I80e451ec1daf55b5ae5c3a76290cf48d5e3de559
khttp/src/main/java/com/squareup/okhttp/Connection.java
eea7b582a768673a31f7e62468138cc6c722a0a4 12-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
edf5b5a1dca1f70c12d28eeb0bbe913aa75e1971 11-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
ed681f967601ca390a8cfeaae209b68a2ab097d9 10-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
267f5a8a4ae6489afef6c59b71036b33a525421d 09-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
258ec506e4aba6b941cff99a87cb13e69b34ee6d 07-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
bedf2971d7ab2a9f1d30331871c00b13751c84c2 06-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
5e2203da050b56e54e1af24e0b3c9cbef2aa4e5f 05-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
6b2fc4abcf2c4db8f7d2f4eea33f2a455fc5d88e 04-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
91e1b0be4ea9caf3a7c35c33f2c4ed84172c5833 03-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
69aa689b5d939a095811c367eed4a579a4d83422 02-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2ee29995b7bd1068991884a54ca14e9aeeff1a58
2ee29995b7bd1068991884a54ca14e9aeeff1a58 30-Jul-2014 Neil Fuller <nfuller@google.com> Fix transparent gzip for basic auth.

Externally reported Android bug:
https://code.google.com/p/android/issues/detail?id=74026

Thanks to mattpan91 for the report.

The issue was fixed in OkHttp 2.0. It has now been back-ported to 1.6.

This is a cherry pick from the okhttp_16 branch:
https://github.com/square/okhttp/commit/e8fee51087a062384f52e11400ff4a104a00a2b2

The merge was not entirely straightforward: Android is currently not quite
on 1.6; it is close and it was only the package for the files that differed
for existing files. There is an additional class (Job) that had to be patched
that the version Android has and 1.6 does not have. The class is probably not
used on Android.

The okhttp CTS tests pass, modulo some tests known to be flaky.

Bug: 16628050
Bug: https://code.google.com/p/android/issues/detail?id=74026

(cherry picked from commit f6af62d5c9bb5e15649a80ebae973463e8e2dc46)

Change-Id: I3172789a17384666eba732a7782573e08f06a48c
khttp-tests/src/test/java/com/squareup/okhttp/RecordedResponse.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/main/java/com/squareup/okhttp/Job.java
khttp/src/main/java/com/squareup/okhttp/Response.java
khttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
fe04538d0e29512fb99ebec7d1353cc557b4e695 29-Jul-2014 Alex Klyubin <klyubin@google.com> DO NOT MERGE Revert "Remove workaround for *.clients.google.com."

This reverts commit fa38bbf9c7e67011207e31c3372a5a3da765dfe5.

Turns out some apps that connect to android.clients.google.com
still do not use SNI and thus get served a server cert for
*.google.com.

Bug: 5426333
Bug: 16635883
Change-Id: I9009e031070199a2908ad16ca3d7a0a54ea7abcd
khttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
c5cad20e0265620326951320862ad4c6cd72f608 29-Jul-2014 Alex Klyubin <klyubin@google.com> Merge "DO NOT MERGE Revert "Remove workaround for *.clients.google.com."" into lmp-dev
53f542f99c10ac4a99e6d3de8df0246a2025d8e9 29-Jul-2014 Alex Klyubin <klyubin@google.com> DO NOT MERGE Revert "Remove workaround for *.clients.google.com."

This reverts commit fa38bbf9c7e67011207e31c3372a5a3da765dfe5.

Turns out some apps that connect to android.clients.google.com
still do not use SNI and thus get served a server cert for
*.google.com.

Bug: 5426333
Bug: 16635883
Change-Id: I9009e031070199a2908ad16ca3d7a0a54ea7abcd
khttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
1701377c5f118bd1adb45654d7ec8d7866f1e446 28-Jul-2014 Alex Klyubin <klyubin@google.com> Merge "Remove workaround for *.clients.google.com." into lmp-dev
7c7f22d80748dc444d5da3c5be11d7d81ef14a2b 17-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Allow callers to pass in a custom host resolver implementation.

An HTTP client interacts with the network in two main ways: DNS
lookups and connections to HTTP servers. OkHttp already abstracts
the latter by allowing callers to pass in custom SocketFactory
objects, but does not yet abstract the former.

This change takes the existing internal Dns interface, which is
currently used for testing, and turns it into a publicly
accessible HostResolver interface. This allows callers to
completely abstract all network interaction points.

Examples of what this can be used for:

1. Use alternative DNS implementations with different
performance / caching / ordering / parallelization / ...
characteristics than standard InetAddress.getAllByName.
2. Resolve hosts using different DNS servers than the system
resolvers, or even non-DNS protocols (e.g., MDNS or even
NetBIOS/WINS) that are not supported by the system resolver.
3. Do DNS lookups on specific networks, similarly to what
android_getaddrinfofornet does.

Backport of upstream change:
https://github.com/square/okhttp/commit/b19860c9297197a5055ac2ffd6edaedf693c1a85

Change-Id: I6e488acd938067e4c078c6ffe4d5eddb5f3951de
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp/src/main/java/com/squareup/okhttp/HostResolver.java
khttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
khttp/src/main/java/com/squareup/okhttp/internal/Dns.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
fa38bbf9c7e67011207e31c3372a5a3da765dfe5 24-Jul-2014 Alex Klyubin <klyubin@google.com> Remove workaround for *.clients.google.com.

This removes the workaround for broken TLS/SSL server certificates
that were being presented by android.clients.google.com in early 2012
(8576f309825e23add080f2a50345ec1884939c39). The server is presenting
better certificates these days and the workaround is no longer needed.

This is a cherry-pick of upstream commit
https://github.com/square/okhttp/commit/9549fb4455f54d96a307ce17d280ff55df855470

Bug: 5426333

(cherry picked from commit 66acc6793a519c3bf26ccf1bc2f85fa17c19e5ec)

Change-Id: I3a0cee90391e786f5e469ed3af0b9e4d4aa02307
khttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
1410c75d4b2334521208259b69c23aeefec072d7 17-Jul-2014 Lorenzo Colitti <lorenzo@google.com> Use the socket factory for direct connections as well.

Currently, the passed-in socket factory is only used for
connections to HTTP proxies. I think this was not the intent of
the original socket factory change, because the commit message
said that the "socket factory will be used for all non-proxy
connections and HTTP proxy connections". So use it for DIRECT
connections as well.

Also add a test to check that a socket factory is used if
specified.

Cherry-pick of https://github.com/square/okhttp/commit/7f763c1a18e342dc4e2840c68ca99c175c37eb93

(cherry picked from commit a83ddf194ffbae04ce536967efff0ec72df70e10)

Change-Id: Ie3d239d8683a51a2b6ab1dc9d443886d0746e68a
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
3f968acf193178145e9d227f2f08b95e2d6a6c26 15-Apr-2014 Jake Wharton <jw@squareup.com> Allow specifying a socket factory for connections.

This socket factory will be used for all non-proxy connections and HTTP proxy connections.

This is a clean cherry-pick of:
https://github.com/square/okhttp/commit/ff5390d6dcaf79ef09a3ef94dbb7e8ac39572a7f

That was committed about two weeks after we pulled our current
snapshot, so we would have picked this change up on the next
sync with upstream.

Bug: 11826069

(cherry picked from commit e5baca5e4c9de92820a38e60e289d07f1acaa2ef)

Change-Id: Ica683022e6963a0a4f0c3fd1a33c1b843e307c1a
khttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp/src/main/java/com/squareup/okhttp/Address.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
e506e8a30bb854a631da1a242c5492a698292f83 11-Jul-2014 Elliott Hughes <enh@google.com> am 8fb3486d: am d6c1bef6: am 4e9fb0dd: Merge "Fix build."

* commit '8fb3486daea0a2cb9c95ef87acc7c04cc1c42d60':
8fb3486daea0a2cb9c95ef87acc7c04cc1c42d60 11-Jul-2014 Elliott Hughes <enh@google.com> am d6c1bef6: am 4e9fb0dd: Merge "Fix build."

* commit 'd6c1bef6eb10d2d85814fccb06162e5585100a97':
Fix build.
bf740824aebaeb93db6ebd526ab3ceb4f7d47169 08-Jul-2014 Elliott Hughes <enh@google.com> am d6c1bef6: am 4e9fb0dd: Merge "Fix build."

* commit 'd6c1bef6eb10d2d85814fccb06162e5585100a97':
Fix build.
d6c1bef6eb10d2d85814fccb06162e5585100a97 08-Jul-2014 Elliott Hughes <enh@google.com> am 4e9fb0dd: Merge "Fix build."

* commit '4e9fb0dd92a8a36fbd09098a2405b0437ed705fd':
Fix build.
4e9fb0dd92a8a36fbd09098a2405b0437ed705fd 08-Jul-2014 Elliott Hughes <enh@google.com> Merge "Fix build."
4f87695f7e28d8cc0a7ac0097055277c2a460147 17-Jun-2014 Elliott Hughes <enh@google.com> Fix build.

(cherry-pick of cefd6c9fbb2b15cda911fa662b78cad479e8bba4.)

Change-Id: Ic4cdf3f0ef81ccc915717c67e033d80f6d68787a
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/JavaApiConverter.java
75724fa8635b71adb4249d441ebb32d63bb257c5 19-Jun-2014 Brian Carlstrom <bdc@google.com> am b776aa70: am 865f0db0: Merge "Switch from core to core-libart"

* commit 'b776aa7053d6c2a382779c2c5b53d3c9f2b10e92':
Switch from core to core-libart
b776aa7053d6c2a382779c2c5b53d3c9f2b10e92 19-Jun-2014 Brian Carlstrom <bdc@google.com> am 865f0db0: Merge "Switch from core to core-libart"

* commit '865f0db0701c67bccab86b094c0d8e6840f24e41':
Switch from core to core-libart
865f0db0701c67bccab86b094c0d8e6840f24e41 19-Jun-2014 Brian Carlstrom <bdc@google.com> Merge "Switch from core to core-libart"
c5fecf2bb352836b44feb95f5adbfbba9614afd2 19-Jun-2014 Brian Carlstrom <bdc@google.com> Switch from core to core-libart

Bug: 14298175
Change-Id: I1cb07364784fe0047ba84e26d01ec4250aa2492c
ndroid.mk
7c2de39f8a19ab08f35300d701f42d1bfd6c6ee4 17-Jun-2014 Elliott Hughes <enh@google.com> am cefd6c9f: Fix build.

* commit 'cefd6c9fbb2b15cda911fa662b78cad479e8bba4':
Fix build.
cefd6c9fbb2b15cda911fa662b78cad479e8bba4 17-Jun-2014 Elliott Hughes <enh@google.com> Fix build.

Change-Id: Ic4cdf3f0ef81ccc915717c67e033d80f6d68787a
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/JavaApiConverter.java
1bd46a38ee52c1834858cafbe005039b88603b56 11-Jun-2014 Ian Rogers <irogers@google.com> am ca02dc9d: am f66b7973: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit 'ca02dc9dc391edb161d31cde804809eea6d674b9':
Remove deprecated WITH_HOST_DALVIK.
ca02dc9dc391edb161d31cde804809eea6d674b9 10-Jun-2014 Ian Rogers <irogers@google.com> am f66b7973: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit 'f66b797356dbf6986721e60d8e9ec0877cd4e522':
Remove deprecated WITH_HOST_DALVIK.
f66b797356dbf6986721e60d8e9ec0877cd4e522 10-Jun-2014 Ian Rogers <irogers@google.com> Merge "Remove deprecated WITH_HOST_DALVIK."
112fb0840a3eb606a0923626e7f23fd5229f2d7a 23-May-2014 Ian Rogers <irogers@google.com> Remove deprecated WITH_HOST_DALVIK.

Bug: 13751317
Change-Id: I58696b3acf0c75996bab6cdb7169cd39c1da4bf7
ndroid.mk
607eeeda57058c73fc3baedf57b003881f5e53a7 06-Jun-2014 The Android Automerger <android-build@google.com> am c675ba68: merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676

* commit 'c675ba68f68e7aaa2e7131807ebc4a78f00f5293':
Pull upstream fixes from OkHttp
am 08e99bfb: am f5d93b07: Merge "Upgrade OkHttp to newer code"
43df2b698048e9297bd14ab1d1ee79990132d708 29-May-2014 Neil Fuller <nfuller@google.com> am f984b8b9: am 3341b7d2: am 5f331151: Merge "Delete okhttp-tests and add okhttp-tests-nojarjar"

* commit 'f984b8b9ea0f50aae9a280530980ec5995335812':
Delete okhttp-tests and add okhttp-tests-nojarjar
f984b8b9ea0f50aae9a280530980ec5995335812 29-May-2014 Neil Fuller <nfuller@google.com> am 3341b7d2: am 5f331151: Merge "Delete okhttp-tests and add okhttp-tests-nojarjar"

* commit '3341b7d250a6f664f7b913c0158857f5c99a99ec':
Delete okhttp-tests and add okhttp-tests-nojarjar
3341b7d250a6f664f7b913c0158857f5c99a99ec 29-May-2014 Neil Fuller <nfuller@google.com> am 5f331151: Merge "Delete okhttp-tests and add okhttp-tests-nojarjar"

* commit '5f331151268b253770d13b2a3c52bdfdd14deeb5':
Delete okhttp-tests and add okhttp-tests-nojarjar
5f331151268b253770d13b2a3c52bdfdd14deeb5 29-May-2014 Neil Fuller <nfuller@google.com> Merge "Delete okhttp-tests and add okhttp-tests-nojarjar"
30ba61aaf6eabd5dd0a7d0d5e8957427d3dd4841 29-May-2014 Neil Fuller <nfuller@google.com> am d9e6089b: am 43e59e2c: am f3b4edfa: Merge "Add jarjar rules to repackage okio to com.android.okio"

* commit 'd9e6089be3b6e6aafa74960f82b57394d2c77e5e':
Add jarjar rules to repackage okio to com.android.okio
d9e6089be3b6e6aafa74960f82b57394d2c77e5e 29-May-2014 Neil Fuller <nfuller@google.com> am 43e59e2c: am f3b4edfa: Merge "Add jarjar rules to repackage okio to com.android.okio"

* commit '43e59e2ca96deaca095ddbffd0469fd19132b8dc':
Add jarjar rules to repackage okio to com.android.okio
43e59e2ca96deaca095ddbffd0469fd19132b8dc 29-May-2014 Neil Fuller <nfuller@google.com> am f3b4edfa: Merge "Add jarjar rules to repackage okio to com.android.okio"

* commit 'f3b4edfa06801374c84db50b31a5bf43d3f8a3fe':
Add jarjar rules to repackage okio to com.android.okio
98d2d60725cd85a0aa158168cf1426dfc7833582 29-May-2014 Neil Fuller <nfuller@google.com> Delete okhttp-tests and add okhttp-tests-nojarjar

Running jar-jar'd tests is tricky because of classloader
restrictions under Android instrumentation tests. Instead
the tests can be run in their original package against
the okhttp-nojarjar .jar file.

Change-Id: I707051a5493915e8be08754f63610dd45e893246
ndroid.mk
f3b4edfa06801374c84db50b31a5bf43d3f8a3fe 29-May-2014 Neil Fuller <nfuller@google.com> Merge "Add jarjar rules to repackage okio to com.android.okio"
23dbc95af48f86ce9ded2fc12de7ba438b89d1a5 28-May-2014 Neil Fuller <nfuller@google.com> Add jarjar rules to repackage okio to com.android.okio

... and thereby avoid conflicts with apps.

Bug: 15303726
Change-Id: I231ffb6a2e60ae47105b781e0da2ae7866eedff1
arjar-rules.txt
c675ba68f68e7aaa2e7131807ebc4a78f00f5293 22-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
56a0722566a74d7617ed1cae34a39a4a7a920638 22-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
49c85455a9b1347d5b9dee41031e0fe60f683d43 21-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
573be202e2502792e0a2340ddb3d5046461db37c 20-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
143fac66e8773cb2d7f58b06b1ff96813f2d10af 19-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
b0704be514773c4193f8997dfb7231eeb402c38a 18-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
ca6fb6e1dd94f7d3b180cdd6e9d401f2c9fb9c28 17-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
4bbe7c56eb32fbf47d3c153b1193236cc428120c 15-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
6ca6927b98ca9aa39c59c5304cd3b6ef95dbb50f 14-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
2e089a4239732e1d35ea7994803e87c2ab369364 13-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
3741809f2e4637a7577b6326aff13f1d98451b4a 12-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
5cd4d06b01141be5e6afaf232e4f85200e8c546b 11-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
8a7207ce019438cb18111482a6d973e33954d879 10-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
37cb0780402ca524be316f0fe7fadd38d5eb1d07 08-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
51f25bebe7b24b783ad11c2ef72b68aee140b27b 07-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
b7141f7209b3f27282bb20874f186c67371cac3c 07-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
b3fc59b79edd3513878fd87f697433db4cb66d17 06-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
62845b32d35ed11cb5a527f99080766323076d46 05-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
0831b951017b0c457ee4e53dd01d71048d0df0c9 04-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
492c81e65a8988e4100fdee78bc144e020b5cf56 03-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
a17d58ac0511a4fcbfcb1763df4b07e61c4dad45 01-May-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
d136f8796c05bcac29efeb3f13b7d8b16ae50f2c 30-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 05590daa8c2cd929c8a7b0f23d55e0a223a3f676
05590daa8c2cd929c8a7b0f23d55e0a223a3f676 30-Apr-2014 Bill Yi <byi@google.com> am e2a13302: am ec69dbfd: Merge commit \'6c74ff63cf3a770c2048dbf353517ff6e7cdb91d\' into HEAD

* commit 'e2a133024d72fb926059ec6522c84dea2322ba2c':
e2a133024d72fb926059ec6522c84dea2322ba2c 30-Apr-2014 Bill Yi <byi@google.com> am ec69dbfd: Merge commit \'6c74ff63cf3a770c2048dbf353517ff6e7cdb91d\' into HEAD

* commit 'ec69dbfd2dbf4759957ca6e4381428e72c080f35':
ec69dbfd2dbf4759957ca6e4381428e72c080f35 29-Apr-2014 Bill Yi <byi@google.com> Merge commit '6c74ff63cf3a770c2048dbf353517ff6e7cdb91d' into HEAD
5de67978600b97b96a6482e1c560dbc624829476 29-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 5ff014e87974bf09bdde32d05a6c283b5fc3211b
c5e831c39c9675a345459e4e1569b3585b5e5a5a 28-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 5ff014e87974bf09bdde32d05a6c283b5fc3211b
3f4bc96fd776b726c09dd94ead815d727947caa0 27-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 5ff014e87974bf09bdde32d05a6c283b5fc3211b
af09a48cec5434e658372308f8018aaf9443055c 26-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 5ff014e87974bf09bdde32d05a6c283b5fc3211b
01c3ec92fb9426a2d11d2013a4d7164fd63cf940 24-Apr-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to 5ff014e87974bf09bdde32d05a6c283b5fc3211b
b32e86a30ec0fa455a37939ec63cb5a69fd3b9ce 01-Apr-2014 Neil Fuller <nfuller@google.com> Pull upstream fixes from OkHttp

This synced to commit b21b40e480cdcd09b618e399a349556de509d88d
/ master / 1st April 2014.

Notably this contains a fix for apps that bundle an older
copy of OkHttp or which call android.net.http.HttpResponseCache.get()
or android.net.http.HttpResponseCache.put().

See for details:
https://github.com/square/okhttp/pull/672

Change-Id: I90acd9f9946014e834ea203dbc62cdcf7bc80cc6
HANGELOG.md
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/Dispatcher.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/QueueDispatcher.java
ockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/MockWebServerTest.java
khttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/JavaApiConverterTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ThreadInterruptTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/ConnectionPool.java
khttp/src/main/java/com/squareup/okhttp/internal/Platform.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/JavaApiConverter.java
kio/src/main/java/okio/Deadline.java
5ff014e87974bf09bdde32d05a6c283b5fc3211b 01-Apr-2014 Neil Fuller <nfuller@google.com> am 16f7113a: am 808b7a3a: Merge "Pull upstream fixes from OkHttp"

* commit '16f7113abe12fd07562ed88452850975503241c0':
Pull upstream fixes from OkHttp
16f7113abe12fd07562ed88452850975503241c0 01-Apr-2014 Neil Fuller <nfuller@google.com> am 808b7a3a: Merge "Pull upstream fixes from OkHttp"

* commit '808b7a3adfc04a1c9e618dbf35d6ad5f54e46fcf':
Pull upstream fixes from OkHttp
808b7a3adfc04a1c9e618dbf35d6ad5f54e46fcf 01-Apr-2014 Neil Fuller <nfuller@google.com> Merge "Pull upstream fixes from OkHttp"
78092f38ebd93018ead53a87b53118dc829cbb8a 01-Apr-2014 Neil Fuller <nfuller@google.com> Pull upstream fixes from OkHttp

This synced to commit b21b40e480cdcd09b618e399a349556de509d88d
/ master / 1st April 2014.

Notably this contains a fix for apps that bundle an older
copy of OkHttp or which call android.net.http.HttpResponseCache.get()
or android.net.http.HttpResponseCache.put().

See for details:
https://github.com/square/okhttp/pull/672

Change-Id: I90acd9f9946014e834ea203dbc62cdcf7bc80cc6
HANGELOG.md
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/Dispatcher.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/QueueDispatcher.java
ockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/MockWebServerTest.java
khttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/JavaApiConverterTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ThreadInterruptTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/ConnectionPool.java
khttp/src/main/java/com/squareup/okhttp/internal/Platform.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/JavaApiConverter.java
kio/src/main/java/okio/Deadline.java
299ccca78f8f57756b8cad2acf3ac65375e264a2 22-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
698e218f149a100f99ad36df6ac6925fa710eb63 21-Mar-2014 Neil Fuller <nfuller@google.com> am b4ea3ea3: am 99e31cc1: Merge "Pull upstream fixes from OkHttp"

* commit 'b4ea3ea33d482444201ad350c28b4a992f1d834c':
Pull upstream fixes from OkHttp
6c74ff63cf3a770c2048dbf353517ff6e7cdb91d 21-Mar-2014 Neil Fuller <nfuller@google.com> am 99e31cc1: Merge "Pull upstream fixes from OkHttp"

* commit '99e31cc1cb87fe51442c2d2b395f9dccb755fe43':
Pull upstream fixes from OkHttp
b4ea3ea33d482444201ad350c28b4a992f1d834c 21-Mar-2014 Neil Fuller <nfuller@google.com> am 99e31cc1: Merge "Pull upstream fixes from OkHttp"

* commit '99e31cc1cb87fe51442c2d2b395f9dccb755fe43':
Pull upstream fixes from OkHttp
99e31cc1cb87fe51442c2d2b395f9dccb755fe43 21-Mar-2014 Neil Fuller <nfuller@google.com> Merge "Pull upstream fixes from OkHttp"
4944713f5c5b141966ac82973d6a31a634e8e01e 21-Mar-2014 Neil Fuller <nfuller@google.com> Pull upstream fixes from OkHttp

This synced to commit bda555ad61ef55e9ad6e4a30d2e9cfde5fc216ca
/ master / 21st March 2014.

Notably this contains a fix for apps that bundle an older
copy of OkHttp or which call android.net.http.HttpResponseCache.get()
or android.net.http.HttpResponseCache.put().

See for details:
https://github.com/square/okhttp/commit/6cf56de5d0701ff26aa6043c552e17c4665c1287
https://github.com/square/okhttp/commit/e2599be9e073f1be8e929597c358e2664ab0c9a9

Change-Id: I324ac76d8ee6a615c39dc8e19dc90169528ae072
HANGELOG.md
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/JavaApiConverterTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ResponseCacheAdapterTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java
khttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java
khttp/src/main/java/com/squareup/okhttp/internal/http/JavaApiConverter.java
khttp/src/main/java/com/squareup/okhttp/internal/http/ResponseCacheAdapter.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
ebsite/index.html
22eb01de23556e7ef34d97140277bc7a8f4740ce 17-Mar-2014 Neil Fuller <nfuller@google.com> am 08e99bfb: am f5d93b07: Merge "Upgrade OkHttp to newer code"

* commit '08e99bfb5844e79b7fe3af4d05914209ead6da55':
Upgrade OkHttp to newer code
HANGELOG.md
EADME.md
khttp-tests/src/test/java/com/squareup/okhttp/AsyncApiTest.java
khttp-tests/src/test/java/com/squareup/okhttp/RecordingReceiver.java
khttp-tests/src/test/java/com/squareup/okhttp/SyncApiTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
khttp/pom.xml
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java
khttp/src/main/java/com/squareup/okhttp/Job.java
khttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
khttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
khttp/src/main/java/com/squareup/okhttp/internal/Util.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
kio/src/main/java/okio/BufferedSink.java
kio/src/main/java/okio/BufferedSource.java
kio/src/main/java/okio/ByteString.java
kio/src/main/java/okio/DeflaterSink.java
kio/src/main/java/okio/GzipSource.java
kio/src/main/java/okio/OkBuffer.java
kio/src/main/java/okio/RealBufferedSink.java
kio/src/main/java/okio/RealBufferedSource.java
kio/src/main/java/okio/Util.java
kio/src/test/java/okio/ByteStringTest.java
kio/src/test/java/okio/DeflaterSinkTest.java
kio/src/test/java/okio/MockSink.java
kio/src/test/java/okio/OkBufferTest.java
kio/src/test/java/okio/ReadUtf8LineTest.java
kio/src/test/java/okio/RealBufferedSinkTest.java
kio/src/test/java/okio/RealBufferedSourceTest.java
om.xml
amples/crawler/pom.xml
amples/crawler/src/main/java/com/squareup/okhttp/sample/Crawler.java
amples/pom.xml
ebsite/index.html
d5d77cba94789e81c51566f65ae440c3c565cd50 17-Mar-2014 Neil Fuller <nfuller@google.com> am 08e99bfb: am f5d93b07: Merge "Upgrade OkHttp to newer code"

* commit '08e99bfb5844e79b7fe3af4d05914209ead6da55':
Upgrade OkHttp to newer code
08e99bfb5844e79b7fe3af4d05914209ead6da55 17-Mar-2014 Neil Fuller <nfuller@google.com> am f5d93b07: Merge "Upgrade OkHttp to newer code"

* commit 'f5d93b0723508ce791ff85d87d1838ce4fca6f5a':
Upgrade OkHttp to newer code
751d617e29f9af90c7b4f41e24affe281441976d 17-Mar-2014 Neil Fuller <nfuller@google.com> am f5d93b07: Merge "Upgrade OkHttp to newer code"

* commit 'f5d93b0723508ce791ff85d87d1838ce4fca6f5a':
Upgrade OkHttp to newer code
f5d93b0723508ce791ff85d87d1838ce4fca6f5a 17-Mar-2014 Neil Fuller <nfuller@google.com> Merge "Upgrade OkHttp to newer code"
c6bd683320121544811f481709b3fdbcbe9b3866 14-Mar-2014 Neil Fuller <nfuller@google.com> Upgrade OkHttp to newer code

This update includes changes up to
68affbd24d63620e1785ea847f1936760947b9ae / master /
14th March 2014.

Importantly, it contains a DiskLruCache fix which
broke several apps.
https://github.com/square/okhttp/issues/646

Change-Id: I8a489e6d0937a58fad10423154bad939ea4da868
HANGELOG.md
EADME.md
khttp-tests/src/test/java/com/squareup/okhttp/AsyncApiTest.java
khttp-tests/src/test/java/com/squareup/okhttp/RecordingReceiver.java
khttp-tests/src/test/java/com/squareup/okhttp/SyncApiTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
khttp/pom.xml
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java
khttp/src/main/java/com/squareup/okhttp/Job.java
khttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
khttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
khttp/src/main/java/com/squareup/okhttp/internal/Util.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
kio/src/main/java/okio/BufferedSink.java
kio/src/main/java/okio/BufferedSource.java
kio/src/main/java/okio/ByteString.java
kio/src/main/java/okio/DeflaterSink.java
kio/src/main/java/okio/GzipSource.java
kio/src/main/java/okio/OkBuffer.java
kio/src/main/java/okio/RealBufferedSink.java
kio/src/main/java/okio/RealBufferedSource.java
kio/src/main/java/okio/Util.java
kio/src/test/java/okio/ByteStringTest.java
kio/src/test/java/okio/DeflaterSinkTest.java
kio/src/test/java/okio/MockSink.java
kio/src/test/java/okio/OkBufferTest.java
kio/src/test/java/okio/ReadUtf8LineTest.java
kio/src/test/java/okio/RealBufferedSinkTest.java
kio/src/test/java/okio/RealBufferedSourceTest.java
om.xml
amples/crawler/pom.xml
amples/crawler/src/main/java/com/squareup/okhttp/sample/Crawler.java
amples/pom.xml
ebsite/index.html
f40feb6f1e0b00b829191d29036f26444c50955f 13-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
87fcdb943c6afcec092240ad3bb75786dde18e71 12-Mar-2014 Justin Morey <jmorey@google.com> am a87afefe: am fcbc8d34: am b53d6947: Fix Gradle build

* commit 'a87afefe5587246ad987bdd80aeceac9379af23d':
Fix Gradle build
b26f1a3768861353c4a17b9b11c68c862fd951c1 12-Mar-2014 Justin Morey <jmorey@google.com> am 0fd812ee: am 0f8c8b8b: am 04e5463d: Add a number of sample and test apps to the Gradle build

* commit '0fd812eefc9728d7c71ddade8ac3284af7c682ea':
Add a number of sample and test apps to the Gradle build
4ea006e12510dd48d7edd7e2566f4752acfdf961 12-Mar-2014 Costin Manolache <costin@google.com> am 108181d9: am ab19caf9: am 3aed1bfc: Fixed to build cleanly in GMS Core environment, where the platform code is not available.

* commit '108181d91fdf70847770861ffca230e12bf5d355':
Fixed to build cleanly in GMS Core environment, where the platform code is not available.
a87afefe5587246ad987bdd80aeceac9379af23d 11-Mar-2014 Justin Morey <jmorey@google.com> am fcbc8d34: am b53d6947: Fix Gradle build

* commit 'fcbc8d34b5b047f2b01be784ac4d7972258da967':
Fix Gradle build
0fd812eefc9728d7c71ddade8ac3284af7c682ea 11-Mar-2014 Justin Morey <jmorey@google.com> am 0f8c8b8b: am 04e5463d: Add a number of sample and test apps to the Gradle build

* commit '0f8c8b8b77b31592e9790021c588e0835520ac7c':
Add a number of sample and test apps to the Gradle build
108181d91fdf70847770861ffca230e12bf5d355 11-Mar-2014 Costin Manolache <costin@google.com> am ab19caf9: am 3aed1bfc: Fixed to build cleanly in GMS Core environment, where the platform code is not available.

* commit 'ab19caf9782e80d403e63b137506fd54cc5f03b9':
Fixed to build cleanly in GMS Core environment, where the platform code is not available.
c52ee301ae5923fa035f2681c0e528857ebf9a9f 11-Mar-2014 Neil Fuller <nfuller@google.com> am 5a6bf640: Merge "Update okhttp to a more recent commit."

* commit '5a6bf640d16514a44ca99df1b6f2244935046c7c':
Update okhttp to a more recent commit.
fcbc8d34b5b047f2b01be784ac4d7972258da967 11-Mar-2014 Justin Morey <jmorey@google.com> am b53d6947: Fix Gradle build

* commit 'b53d69475129c0437985833454eb1ddec8cd5e82':
Fix Gradle build
0f8c8b8b77b31592e9790021c588e0835520ac7c 11-Mar-2014 Justin Morey <jmorey@google.com> am 04e5463d: Add a number of sample and test apps to the Gradle build

* commit '04e5463d2081145b9749345e7a7f86a2c09ea302':
Add a number of sample and test apps to the Gradle build
ab19caf9782e80d403e63b137506fd54cc5f03b9 11-Mar-2014 Costin Manolache <costin@google.com> am 3aed1bfc: Fixed to build cleanly in GMS Core environment, where the platform code is not available.

* commit '3aed1bfc89e32f93d3e365d07c1c11bc079f3ef3':
Fixed to build cleanly in GMS Core environment, where the platform code is not available.
9bee9632028efd2f446dadddf073f87bda9c684d 10-Mar-2014 Justin Morey <jmorey@google.com> am b53d6947: Fix Gradle build

* commit 'b53d69475129c0437985833454eb1ddec8cd5e82':
Fix Gradle build
b53d69475129c0437985833454eb1ddec8cd5e82 10-Mar-2014 Justin Morey <jmorey@google.com> Fix Gradle build

Change-Id: Idef6394c9fdfbc2dcbd4c295f2f2a877fcc7106c
uild.gradle
22e99da6b48bbfb7c4163236b953b3ea7daacb84 10-Mar-2014 Justin Morey <jmorey@google.com> am 04e5463d: Add a number of sample and test apps to the Gradle build

* commit '04e5463d2081145b9749345e7a7f86a2c09ea302':
Add a number of sample and test apps to the Gradle build
04e5463d2081145b9749345e7a7f86a2c09ea302 26-Feb-2014 Justin Morey <jmorey@google.com> Add a number of sample and test apps to the Gradle build

Change-Id: Ia84ff4177a7d37369e4ef16e398e01ba9c5607e0
(cherry picked from commit 5e6270761f80dceb350cc3af2d976a06ae2870b3)
uild.gradle
6daa2d53a6cd17e0b70ee4e15d2f8028661a3b91 10-Mar-2014 Costin Manolache <costin@google.com> am 3aed1bfc: Fixed to build cleanly in GMS Core environment, where the platform code is not available.

* commit '3aed1bfc89e32f93d3e365d07c1c11bc079f3ef3':
Fixed to build cleanly in GMS Core environment, where the platform code is not available.
3aed1bfc89e32f93d3e365d07c1c11bc079f3ef3 18-Sep-2013 Costin Manolache <costin@google.com> Fixed to build cleanly in GMS Core environment, where the platform code is not available.

Change-Id: Ie427e37cb6b7df5293fdbd9b65a561dc9d4da659
(cherry picked from commit 1de2f9d7ddb6678573319c90892153b75aec5bce)
ndroid.mk
451fb8b9338fa01e45c673544f562034c85eb692 10-Mar-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
463dab942d0981312159bafaa210cb77acd45ee0 10-Mar-2014 Neil Fuller <nfuller@google.com> am 57b96aee: am 5a6bf640: Merge "Update okhttp to a more recent commit."

* commit '57b96aee82cffdd358acb47734ee98700237e050':
Update okhttp to a more recent commit.
57b96aee82cffdd358acb47734ee98700237e050 10-Mar-2014 Neil Fuller <nfuller@google.com> am 5a6bf640: Merge "Update okhttp to a more recent commit."

* commit '5a6bf640d16514a44ca99df1b6f2244935046c7c':
Update okhttp to a more recent commit.
5a6bf640d16514a44ca99df1b6f2244935046c7c 10-Mar-2014 Neil Fuller <nfuller@google.com> Merge "Update okhttp to a more recent commit."
3c938a3f6b61ce5e2dba0d039b03fe73b89fd26c 19-Feb-2014 Neil Fuller <nfuller@google.com> Update okhttp to a more recent commit.

Updating to upstream commit : 7b106923e078ac2435e8c8ce9d615f9903106ed8
/ 7th Mar 2014 / main branch.

The following changes were made to Android-only code:
1) HttpsHandler has been changed to deal with the fix for:
https://github.com/square/okhttp/issues/184 (commit 5d7fdba).
2) Platform.java changed to accomodate changes in okhttp Platform
method signatures.
3) .mk file updates to reflect src directory changes.

The following changes were made to OkHttp code:
1) Removal of org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
annotation from okio/src/main/java/okio/DeflaterSink.java

Change-Id: I644a883482ac7ee7d029785f110a2ca00762419b
ndroid.mk
HANGELOG.md
EADME.android
EADME.md
ndroid/main/java/com/squareup/okhttp/HttpHandler.java
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
enchmarks/README.md
enchmarks/pom.xml
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/ApacheHttpClient.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/Benchmark.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/Client.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/HttpClient.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/NettyHttpClient.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/OkHttp.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/OkHttpAsync.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/SynchronousHttpClient.java
enchmarks/src/main/java/com/squareup/okhttp/benchmarks/UrlConnection.java
oncurrency.md
ockwebserver/README.md
ockwebserver/pom.xml
ockwebserver/src/main/java/com/squareup/okhttp/internal/SslContextBuilder.java
ockwebserver/src/main/java/com/squareup/okhttp/internal/spdy/SpdyServer.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockResponse.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/PushPromise.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/SocketPolicy.java
ockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/CustomDispatcherTest.java
kcurl/README.md
kcurl/pom.xml
kcurl/src/main/java/com/squareup/okhttp/curl/Main.java
kcurl/src/main/resources/okcurl-version.properties
kcurl/src/test/java/com/squareup/okhttp/curl/MainTest.java
khttp-apache/pom.xml
khttp-protocols/pom.xml
khttp-protocols/src/main/java/com/squareup/okhttp/internal/Base64.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/Util.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Hpack.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft04.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/HpackTest.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
khttp-tests/pom.xml
khttp-tests/src/test/java/com/squareup/okhttp/AsyncApiTest.java
khttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp-tests/src/test/java/com/squareup/okhttp/DispatcherTest.java
khttp-tests/src/test/java/com/squareup/okhttp/MediaTypeTest.java
khttp-tests/src/test/java/com/squareup/okhttp/RecordedResponse.java
khttp-tests/src/test/java/com/squareup/okhttp/RecordingReceiver.java
khttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
khttp-tests/src/test/java/com/squareup/okhttp/SyncApiTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/BitArrayTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/CookiesTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ExternalHttp2Example.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverHttp20Draft09Test.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdy3Test.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ResponseCacheAdapterTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/ResponseCacheTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/StatusLineTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/BaseTestHandler.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HpackDraft05Test.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http20Draft09Test.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/HuffmanTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3Test.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
khttp-tests/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
khttp/pom.xml
khttp/src/main/java/com/squareup/okhttp/Address.java
khttp/src/main/java/com/squareup/okhttp/CacheControl.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/ConnectionPool.java
khttp/src/main/java/com/squareup/okhttp/Dispatcher.java
khttp/src/main/java/com/squareup/okhttp/Failure.java
khttp/src/main/java/com/squareup/okhttp/Handshake.java
khttp/src/main/java/com/squareup/okhttp/Headers.java
khttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java
khttp/src/main/java/com/squareup/okhttp/Job.java
khttp/src/main/java/com/squareup/okhttp/OkAuthenticator.java
khttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
khttp/src/main/java/com/squareup/okhttp/OkResponseCache.java
khttp/src/main/java/com/squareup/okhttp/Protocol.java
khttp/src/main/java/com/squareup/okhttp/Request.java
khttp/src/main/java/com/squareup/okhttp/Response.java
khttp/src/main/java/com/squareup/okhttp/ResponseSource.java
khttp/src/main/java/com/squareup/okhttp/Route.java
khttp/src/main/java/com/squareup/okhttp/RouteDatabase.java
khttp/src/main/java/com/squareup/okhttp/TunnelRequest.java
khttp/src/main/java/com/squareup/okhttp/internal/AbstractOutputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/BitArray.java
khttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
khttp/src/main/java/com/squareup/okhttp/internal/Dns.java
khttp/src/main/java/com/squareup/okhttp/internal/FaultRecoveringOutputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java
khttp/src/main/java/com/squareup/okhttp/internal/Platform.java
khttp/src/main/java/com/squareup/okhttp/internal/StrictLineReader.java
khttp/src/main/java/com/squareup/okhttp/internal/Util.java
khttp/src/main/java/com/squareup/okhttp/internal/http/AbstractHttpInputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java
khttp/src/main/java/com/squareup/okhttp/internal/http/DelegatingHttpsURLConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HeaderParser.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpDate.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpMethod.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpsEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/OkHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/OkResponseCacheAdapter.java
khttp/src/main/java/com/squareup/okhttp/internal/http/Policy.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RequestLine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/ResponseCacheAdapter.java
khttp/src/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RetryableOutputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RetryableSink.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
khttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/StatusLine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/Transport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/UnknownLengthHttpInputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Header.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft09.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Huffman.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/PushObserver.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
khttp/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java
khttp/src/test/java/com/squareup/okhttp/AsyncApiTest.java
khttp/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp/src/test/java/com/squareup/okhttp/MediaTypeTest.java
khttp/src/test/java/com/squareup/okhttp/RecordedResponse.java
khttp/src/test/java/com/squareup/okhttp/RecordingReceiver.java
khttp/src/test/java/com/squareup/okhttp/RequestTest.java
khttp/src/test/java/com/squareup/okhttp/internal/FaultRecoveringOutputStreamTest.java
khttp/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
khttp/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
khttp/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
khttp/src/test/java/com/squareup/okhttp/internal/StrictLineReaderTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
khttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
khttp/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
khttp/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
kio/pom.xml
kio/src/main/java/okio/Base64.java
kio/src/main/java/okio/BufferedSink.java
kio/src/main/java/okio/BufferedSource.java
kio/src/main/java/okio/ByteString.java
kio/src/main/java/okio/Deadline.java
kio/src/main/java/okio/DeflaterSink.java
kio/src/main/java/okio/GzipSource.java
kio/src/main/java/okio/InflaterSource.java
kio/src/main/java/okio/OkBuffer.java
kio/src/main/java/okio/Okio.java
kio/src/main/java/okio/RealBufferedSink.java
kio/src/main/java/okio/RealBufferedSource.java
kio/src/main/java/okio/Segment.java
kio/src/main/java/okio/SegmentPool.java
kio/src/main/java/okio/Sink.java
kio/src/main/java/okio/Source.java
kio/src/main/java/okio/Util.java
kio/src/test/java/okio/ByteStringTest.java
kio/src/test/java/okio/DeflaterSinkTest.java
kio/src/test/java/okio/GzipSourceTest.java
kio/src/test/java/okio/InflaterSourceTest.java
kio/src/test/java/okio/OkBufferReadUtf8LineTest.java
kio/src/test/java/okio/OkBufferTest.java
kio/src/test/java/okio/OkioTest.java
kio/src/test/java/okio/ReadUtf8LineTest.java
kio/src/test/java/okio/RealBufferedSinkTest.java
kio/src/test/java/okio/RealBufferedSourceReadUtf8LineTest.java
kio/src/test/java/okio/RealBufferedSourceTest.java
arent.iws
om.xml
amples/guide/pom.xml
amples/pom.xml
amples/simple-client/pom.xml
amples/simple-client/src/main/java/com/squareup/okhttp/sample/OkHttpContributors.java
amples/static-server/pom.xml
amples/static-server/src/main/java/com/squareup/okhttp/sample/SampleServer.java
ebsite/index.html
59df6ad33be9c42f2a1017fdb13d5cb91d6713ea 27-Feb-2014 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
5e6270761f80dceb350cc3af2d976a06ae2870b3 26-Feb-2014 Justin Morey <jmorey@google.com> Add a number of sample and test apps to the Gradle build

Change-Id: Ia84ff4177a7d37369e4ef16e398e01ba9c5607e0
uild.gradle
ca84aac17ce6b792af80a46964498ecb44422e87 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 4f902f56: am 8db86568: Merge commit \'1bbb3a16a5ed2f947a113d8ff2f77f07929fc2d4\' into HEAD

* commit '4f902f568685edbb607c5b9973382f77de2f3f48':
4f902f568685edbb607c5b9973382f77de2f3f48 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 8db86568: Merge commit \'1bbb3a16a5ed2f947a113d8ff2f77f07929fc2d4\' into HEAD

* commit '8db86568225323a9651646efec0c9271ec82cbf0':
8db86568225323a9651646efec0c9271ec82cbf0 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '1bbb3a16a5ed2f947a113d8ff2f77f07929fc2d4' into HEAD
8fa3abe059aff7e103ffe391d2319dd262dd4a62 25-Nov-2013 Narayan Kamath <narayan@google.com> am 642242c3: am 1168a050: Merge "Remove use of LOCAL_BUILD_HOST_DEX"

* commit '642242c342a08167b385879636c58f59be794668':
Remove use of LOCAL_BUILD_HOST_DEX
642242c342a08167b385879636c58f59be794668 25-Nov-2013 Narayan Kamath <narayan@google.com> am 1168a050: Merge "Remove use of LOCAL_BUILD_HOST_DEX"

* commit '1168a05003b5957e62f8c926ec2d0a0dd8bef808':
Remove use of LOCAL_BUILD_HOST_DEX
1168a05003b5957e62f8c926ec2d0a0dd8bef808 25-Nov-2013 Narayan Kamath <narayan@google.com> Merge "Remove use of LOCAL_BUILD_HOST_DEX"
565b47238713f6ae430101adb577ab1cd8bdb65d 28-Oct-2013 Narayan Kamath <narayan@google.com> Remove use of LOCAL_BUILD_HOST_DEX

Use the new BUILD_HOST_DALVIK_JAVA_LIBRARY rule instead.

(cherry picked from commit 857e2105b022ff46c1c617187d9faffaacde28cc)

Change-Id: I8477abba8072578a08b5b463f4dc9476c9224e35
ndroid.mk
7920cbe2febfa64eb6538ee21441574da2b9890b 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am ea0fcb46: am c16fe4a6: Merge commit \'d9761bc4827611272110b2416d11f60e683ca8a2\' into HEAD

* commit 'ea0fcb46318f08762f1cb9a5c6ef4e0ab11d39b7':
ea0fcb46318f08762f1cb9a5c6ef4e0ab11d39b7 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am c16fe4a6: Merge commit \'d9761bc4827611272110b2416d11f60e683ca8a2\' into HEAD

* commit 'c16fe4a6ea7a162a0b7fb519509cf78f295687d9':
c16fe4a6ea7a162a0b7fb519509cf78f295687d9 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'd9761bc4827611272110b2416d11f60e683ca8a2' into HEAD
e95a569a5311453e1b48bb8ba8efa7f8f1aaca4a 11-Nov-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
3f0d3bcf84a4dc97648a3cb3f340ba1d1e79090a 07-Nov-2013 Narayan Kamath <narayan@google.com> Merge "Remove use of LOCAL_BUILD_HOST_DEX"
812143dcaf0c15c7110fd0248912fa4003513946 06-Nov-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
21500b3cbda46c777de6d7333968c4ca25accca7 05-Nov-2013 Narayan Kamath <narayan@google.com> am 1bbb3a16: am 49d9ce33: Make scheme & realm comparisons case insensitive.

* commit '1bbb3a16a5ed2f947a113d8ff2f77f07929fc2d4':
Make scheme & realm comparisons case insensitive.
1bbb3a16a5ed2f947a113d8ff2f77f07929fc2d4 05-Nov-2013 Narayan Kamath <narayan@google.com> am 49d9ce33: Make scheme & realm comparisons case insensitive.

* commit '49d9ce3394234904623bdcc8d781017e58008a37':
Make scheme & realm comparisons case insensitive.
66e7a4490fb85a6a5540371660e8366fd968c90d 05-Nov-2013 Narayan Kamath <narayan@google.com> am ad4ac170: am 6ac81b7f: Merge "Fix assert import in RawHeadersTest."

* commit 'ad4ac170d6ed05ec6e6006dcb286c3c1e584d8f0':
Fix assert import in RawHeadersTest.
056b33cf09168013bd6211f439bd574e06340aff 05-Nov-2013 Narayan Kamath <narayan@google.com> am 23dfa62d: am cbb998ea: Merge "Update okhttp."

* commit '23dfa62d8c4c7d3958f8351191a7127483bd4f1c':
Update okhttp.
ad4ac170d6ed05ec6e6006dcb286c3c1e584d8f0 05-Nov-2013 Narayan Kamath <narayan@google.com> am 6ac81b7f: Merge "Fix assert import in RawHeadersTest."

* commit '6ac81b7f6caf21de5ffb81e5f3355f6ab2d7eebb':
Fix assert import in RawHeadersTest.
23dfa62d8c4c7d3958f8351191a7127483bd4f1c 05-Nov-2013 Narayan Kamath <narayan@google.com> am cbb998ea: Merge "Update okhttp."

* commit 'cbb998ea86f78c4eb8fd93696a7842306774ffaa':
Update okhttp.
6ac81b7f6caf21de5ffb81e5f3355f6ab2d7eebb 05-Nov-2013 Narayan Kamath <narayan@google.com> Merge "Fix assert import in RawHeadersTest."
cbb998ea86f78c4eb8fd93696a7842306774ffaa 05-Nov-2013 Narayan Kamath <narayan@google.com> Merge "Update okhttp."
49d9ce3394234904623bdcc8d781017e58008a37 04-Nov-2013 Narayan Kamath <narayan@google.com> Make scheme & realm comparisons case insensitive.

This is a manual cherry pick of change

https://github.com/square/okhttp/pull/345

bug: 11473660
Change-Id: Ic757bec6c63ebad7f06922c16120f9b6161b7691
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
a1f58d96d91c5825b59dadb8816438105b85dae1 04-Nov-2013 Narayan Kamath <narayan@google.com> Fix assert import in RawHeadersTest.

junit.framework.Assert isn't pulled in by junit4-target
because it's meant to be used only by junit3.

Change-Id: I01fae4f1fa13643f9b2bf1d5885c0141529b3f06
khttp/src/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
166772be0e5cfdaea1a64b9f63e4c8dbfe48cba3 04-Nov-2013 Narayan Kamath <narayan@google.com> Update okhttp.

Updated to commit 19a21936ffbb5e358799af9e4fb7306af45f38.

This also moves src/ to okhttp/src/ to stay faithful
to the original okhttp tree & to make it easier to pull
updates.

Change-Id: Ia1971823f31e5c6957d831f368e3a1fcce38d44d
ndroid.mk
HANGELOG.md
EADME.md
heckstyle.xml
eploy_website.sh
ockwebserver/pom.xml
ockwebserver/src/main/java/com/squareup/okhttp/internal/SslContextBuilder.java
ockwebserver/src/main/java/com/squareup/okhttp/internal/spdy/SpdyServer.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/Dispatcher.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockResponse.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/QueueDispatcher.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java
ockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/SocketPolicy.java
ockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/CustomDispatcherTest.java
ockwebserver/src/test/java/com/squareup/okhttp/mockwebserver/MockWebServerTest.java
khttp-apache/README.md
khttp-apache/pom.xml
khttp-apache/src/main/java/com/squareup/okhttp/apache/OkApacheClient.java
khttp-apache/src/test/java/com/squareup/okhttp/apache/OkApacheClientTest.java
khttp-protocols/pom.xml
khttp-protocols/src/main/java/com/squareup/okhttp/internal/Base64.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/NamedRunnable.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/Platform.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/Util.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/ErrorCode.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameReader.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/FrameWriter.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HeadersMode.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Hpack.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Http20Draft04.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/NameValueBlockReader.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Ping.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Spdy3.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
khttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/Variant.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/HpackTest.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
khttp-protocols/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
khttp/pom.xml
khttp/src/main/java/com/squareup/okhttp/Address.java
khttp/src/main/java/com/squareup/okhttp/Connection.java
khttp/src/main/java/com/squareup/okhttp/ConnectionPool.java
khttp/src/main/java/com/squareup/okhttp/Dispatcher.java
khttp/src/main/java/com/squareup/okhttp/Failure.java
khttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java
khttp/src/main/java/com/squareup/okhttp/Job.java
khttp/src/main/java/com/squareup/okhttp/MediaType.java
khttp/src/main/java/com/squareup/okhttp/OkAuthenticator.java
khttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
khttp/src/main/java/com/squareup/okhttp/OkResponseCache.java
khttp/src/main/java/com/squareup/okhttp/Request.java
khttp/src/main/java/com/squareup/okhttp/Response.java
khttp/src/main/java/com/squareup/okhttp/ResponseSource.java
khttp/src/main/java/com/squareup/okhttp/Route.java
khttp/src/main/java/com/squareup/okhttp/RouteDatabase.java
khttp/src/main/java/com/squareup/okhttp/TunnelRequest.java
khttp/src/main/java/com/squareup/okhttp/internal/AbstractOutputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
khttp/src/main/java/com/squareup/okhttp/internal/Dns.java
khttp/src/main/java/com/squareup/okhttp/internal/FaultRecoveringOutputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/StrictLineReader.java
khttp/src/main/java/com/squareup/okhttp/internal/http/AbstractHttpInputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HeaderParser.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpDate.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpsEngine.java
khttp/src/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
khttp/src/main/java/com/squareup/okhttp/internal/http/OkResponseCacheAdapter.java
khttp/src/main/java/com/squareup/okhttp/internal/http/Policy.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RetryableOutputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
khttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/Transport.java
khttp/src/main/java/com/squareup/okhttp/internal/http/UnknownLengthHttpInputStream.java
khttp/src/main/java/com/squareup/okhttp/internal/tls/DistinguishedNameParser.java
khttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
khttp/src/test/java/com/squareup/okhttp/AsyncApiTest.java
khttp/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java
khttp/src/test/java/com/squareup/okhttp/MediaTypeTest.java
khttp/src/test/java/com/squareup/okhttp/RecordedResponse.java
khttp/src/test/java/com/squareup/okhttp/RecordingReceiver.java
khttp/src/test/java/com/squareup/okhttp/RequestTest.java
khttp/src/test/java/com/squareup/okhttp/internal/FaultRecoveringOutputStreamTest.java
khttp/src/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
khttp/src/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
khttp/src/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
khttp/src/test/java/com/squareup/okhttp/internal/StrictLineReaderTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
khttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
khttp/src/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
khttp/src/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
khttp/src/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
arent.iws
om.xml
amples/guide/pom.xml
amples/guide/src/main/java/com/squareup/okhttp/guide/GetExample.java
amples/guide/src/main/java/com/squareup/okhttp/guide/PostExample.java
amples/pom.xml
amples/simple-client/pom.xml
amples/simple-client/src/main/java/com/squareup/okhttp/sample/OkHttpContributors.java
amples/static-server/pom.xml
amples/static-server/src/main/java/com/squareup/okhttp/sample/SampleServer.java
rc/main/java/com/squareup/okhttp/Address.java
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/ConnectionPool.java
rc/main/java/com/squareup/okhttp/Failure.java
rc/main/java/com/squareup/okhttp/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/MediaType.java
rc/main/java/com/squareup/okhttp/OkAuthenticator.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/OkResponseCache.java
rc/main/java/com/squareup/okhttp/Request.java
rc/main/java/com/squareup/okhttp/Response.java
rc/main/java/com/squareup/okhttp/ResponseSource.java
rc/main/java/com/squareup/okhttp/Route.java
rc/main/java/com/squareup/okhttp/RouteDatabase.java
rc/main/java/com/squareup/okhttp/TunnelRequest.java
rc/main/java/com/squareup/okhttp/internal/AbstractOutputStream.java
rc/main/java/com/squareup/okhttp/internal/Base64.java
rc/main/java/com/squareup/okhttp/internal/DiskLruCache.java
rc/main/java/com/squareup/okhttp/internal/Dns.java
rc/main/java/com/squareup/okhttp/internal/FaultRecoveringOutputStream.java
rc/main/java/com/squareup/okhttp/internal/NamedRunnable.java
rc/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/internal/StrictLineReader.java
rc/main/java/com/squareup/okhttp/internal/Util.java
rc/main/java/com/squareup/okhttp/internal/http/AbstractHttpInputStream.java
rc/main/java/com/squareup/okhttp/internal/http/Dispatcher.java
rc/main/java/com/squareup/okhttp/internal/http/HeaderParser.java
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
rc/main/java/com/squareup/okhttp/internal/http/HttpDate.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/Job.java
rc/main/java/com/squareup/okhttp/internal/http/OkResponseCacheAdapter.java
rc/main/java/com/squareup/okhttp/internal/http/Policy.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RetryableOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/main/java/com/squareup/okhttp/internal/http/Transport.java
rc/main/java/com/squareup/okhttp/internal/http/UnknownLengthHttpInputStream.java
rc/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
rc/main/java/com/squareup/okhttp/internal/spdy/Ping.java
rc/main/java/com/squareup/okhttp/internal/spdy/Settings.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyWriter.java
rc/main/java/com/squareup/okhttp/internal/tls/DistinguishedNameParser.java
rc/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
rc/test/java/com/squareup/okhttp/ConnectionPoolTest.java
rc/test/java/com/squareup/okhttp/MediaTypeTest.java
rc/test/java/com/squareup/okhttp/RequestTest.java
rc/test/java/com/squareup/okhttp/internal/AsyncApiTest.java
rc/test/java/com/squareup/okhttp/internal/FaultRecoveringOutputStreamTest.java
rc/test/java/com/squareup/okhttp/internal/RecordedResponse.java
rc/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
rc/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
rc/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
rc/test/java/com/squareup/okhttp/internal/RecordingReceiver.java
rc/test/java/com/squareup/okhttp/internal/SslContextBuilder.java
rc/test/java/com/squareup/okhttp/internal/StrictLineReaderTest.java
rc/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
rc/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rc/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
rc/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
rc/test/java/com/squareup/okhttp/internal/mockspdyserver/MockSpdyServer.java
rc/test/java/com/squareup/okhttp/internal/spdy/HttpOverSpdyTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
rc/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/SpdyServer.java
rc/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
rc/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
ebsite/index.html
ebsite/static/app-theme.css
ebsite/static/app.css
ebsite/static/bootstrap-combined.min.css
ebsite/static/bootstrap.min.js
ebsite/static/html5shiv.min.js
ebsite/static/icon-github.png
ebsite/static/icon-square.png
ebsite/static/jquery-maven-artifact.min.js
ebsite/static/jquery.smooth-scroll.min.js
ebsite/static/logo-square.png
ebsite/static/prettify.js
857e2105b022ff46c1c617187d9faffaacde28cc 28-Oct-2013 Narayan Kamath <narayan@google.com> Remove use of LOCAL_BUILD_HOST_DEX

Use the new BUILD_HOST_DALVIK_JAVA_LIBRARY rule instead.

Change-Id: Ic9325d053f7c55646842daf7caf2562c1b5884cf
ndroid.mk
3fccae9513e72bd5f35dbdc2283119f0a9462a6d 09-Oct-2013 Ed Heyl <edheyl@google.com> am d9761bc4: am 18685c9f: merge in KQS81M

* commit 'd9761bc4827611272110b2416d11f60e683ca8a2':
Fix HttpsUrlConnection#setDefaultHostnameVerifier.
d9761bc4827611272110b2416d11f60e683ca8a2 09-Oct-2013 Ed Heyl <edheyl@google.com> am 18685c9f: merge in KQS81M

* commit '18685c9f8d0f64f781cdd7df91aea7eb49679e81':
Fix HttpsUrlConnection#setDefaultHostnameVerifier.
18685c9f8d0f64f781cdd7df91aea7eb49679e81 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KQS81M
e87f2c04de24f5d29d23880513350eed4ba53e6e 23-Sep-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
1de2f9d7ddb6678573319c90892153b75aec5bce 18-Sep-2013 Costin Manolache <costin@google.com> Fixed to build cleanly in GMS Core environment, where the platform code is not available.

Change-Id: Ie427e37cb6b7df5293fdbd9b65a561dc9d4da659
ndroid.mk
991d7a313e26c24faf75c4fead467f666b7dcfc0 06-Sep-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
2946265382960fbd8e2bd765e40e3bc7016e960e 22-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
e71f01a945e6dacd7dc62e7d0552a9ad28af9558 21-Aug-2013 Narayan Kamath <narayan@google.com> am 26c320b0: am 06672b78: Merge "Don\'t support anything other than Basic auth." into klp-dev

* commit '26c320b03f11b42ee4fc24610db31815d8e52fdc':
Don't support anything other than Basic auth.
26c320b03f11b42ee4fc24610db31815d8e52fdc 21-Aug-2013 Narayan Kamath <narayan@google.com> am 06672b78: Merge "Don\'t support anything other than Basic auth." into klp-dev

* commit '06672b78f27545ea2d9bec92f6294ba68003bd9b':
Don't support anything other than Basic auth.
06672b78f27545ea2d9bec92f6294ba68003bd9b 21-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Don't support anything other than Basic auth." into klp-dev
123333e7759f91b846c58849469b9d0ab21213f6 20-Aug-2013 Narayan Kamath <narayan@google.com> 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

(cherry picked from 1f4d585511555a40e0167bf20b4a6f2bb977120)

bug: 10211309

Change-Id: I110844dd104b7673f987ccb89e7a63db2b4e50a3
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
4ae49dcb6dbde08e90f971aa44a4771501683637 21-Aug-2013 Narayan Kamath <narayan@google.com> am 7922e741: am e9b2610e: Fix HttpUrlConnection#isUsingProxy.

* commit '7922e741fd72c722599d44c7ec648dc83d41b963':
Fix HttpUrlConnection#isUsingProxy.
7922e741fd72c722599d44c7ec648dc83d41b963 21-Aug-2013 Narayan Kamath <narayan@google.com> am e9b2610e: Fix HttpUrlConnection#isUsingProxy.

* commit 'e9b2610e627486d902b141fd8ac4cca574425610':
Fix HttpUrlConnection#isUsingProxy.
93ff7f05566e66b85dd16244ea4028f3328bc062 21-Aug-2013 Narayan Kamath <narayan@google.com> am 7148e61d: am ed17abea: Merge "Don\'t support anything other than Basic auth."

* commit '7148e61d0687a436a5d48c0dd64686fc00084c8d':
Don't support anything other than Basic auth.
7148e61d0687a436a5d48c0dd64686fc00084c8d 21-Aug-2013 Narayan Kamath <narayan@google.com> am ed17abea: Merge "Don\'t support anything other than Basic auth."

* commit 'ed17abea772718d6a8fdaafbfa52f118e07bda92':
Don't support anything other than Basic auth.
ed17abea772718d6a8fdaafbfa52f118e07bda92 21-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Don't support anything other than Basic auth."
1f4d585511555a40e0167bf20b4a6f2bb977120a 20-Aug-2013 Narayan Kamath <narayan@google.com> 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

Change-Id: I110844dd104b7673f987ccb89e7a63db2b4e50a3
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
5ff84551052b2d837446705acc97419db4876490 21-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
e9b2610e627486d902b141fd8ac4cca574425610 16-Aug-2013 Narayan Kamath <narayan@google.com> 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

(cherry picked from be9eef7153fff0107f609d4276f2ae7ac868258)

bug: 10209026

Change-Id: I3183c50ce21c5a19ac1f34f2ff5648683b526dd7
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/Policy.java
3f1a2ddc33082034ba28e8c7c6a11d1717fcc25b 21-Aug-2013 Narayan Kamath <narayan@google.com> am 6c4b3214: am 12a41c08: Merge "Fix HttpUrlConnection#isUsingProxy."

* commit '6c4b32145a40131b199bc070ddc61de4fd925f8f':
Fix HttpUrlConnection#isUsingProxy.
6c4b32145a40131b199bc070ddc61de4fd925f8f 21-Aug-2013 Narayan Kamath <narayan@google.com> am 12a41c08: Merge "Fix HttpUrlConnection#isUsingProxy."

* commit '12a41c08130b0bd409b84ef02f25a635cbf618bb':
Fix HttpUrlConnection#isUsingProxy.
12a41c08130b0bd409b84ef02f25a635cbf618bb 21-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Fix HttpUrlConnection#isUsingProxy."
be9eef7153fff0107f609d4276f2ae7ac868258b 16-Aug-2013 Narayan Kamath <narayan@google.com> 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

Change-Id: I3183c50ce21c5a19ac1f34f2ff5648683b526dd7
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/Policy.java
82157ccfd65ee33e55ba6562f213fbb474fb0761 20-Aug-2013 Narayan Kamath <narayan@google.com> am 03200bdc: am 395bb551: Merge "Respect read timeout on recycled connections." into klp-dev

* commit '03200bdcd67002ee58c97f51867e0b44fbbe4dd0':
Respect read timeout on recycled connections.
03200bdcd67002ee58c97f51867e0b44fbbe4dd0 20-Aug-2013 Narayan Kamath <narayan@google.com> am 395bb551: Merge "Respect read timeout on recycled connections." into klp-dev

* commit '395bb55182abbcb8347ec38e4a314ef86f750680':
Respect read timeout on recycled connections.
395bb55182abbcb8347ec38e4a314ef86f750680 20-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Respect read timeout on recycled connections." into klp-dev
c751735f4b637fbb39a99412069bbd64a44f9c86 20-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
10662b22b663bf8517329c58c06bbc7d0f4e260e 19-Aug-2013 Narayan Kamath <narayan@google.com> Respect read timeout on recycled connections.

Partial fix for CTS test : URLConnectionTest#testGetKeepAlive.

(cherry picked from 76739264ce52fe7a6c5c3558dad87b649118deff)

bug: 10211309

Change-Id: I1f94ea1a3449440f749264a7696c18663e872b17
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
a895b108b2f9267d4bc6d0327db9285b1a65cf61 20-Aug-2013 Narayan Kamath <narayan@google.com> am 2cfad6ba: am 68a95891: Merge "Respect read timeout on recycled connections."

* commit '2cfad6baa732474002e65ee45b30e5908f6d4a84':
Respect read timeout on recycled connections.
b9d13ef90909378189100d391953e5c49b3e488d 20-Aug-2013 Narayan Kamath <narayan@google.com> am 0c4f11b3: am ec3d1055: Allow certificate inspections after connect.

* commit '0c4f11b38a1ca38eaf101c193ea67cd4694f7c49':
Allow certificate inspections after connect.
2cfad6baa732474002e65ee45b30e5908f6d4a84 20-Aug-2013 Narayan Kamath <narayan@google.com> am 68a95891: Merge "Respect read timeout on recycled connections."

* commit '68a95891635423c7d4e84bf9457e68dc53d4b21a':
Respect read timeout on recycled connections.
0c4f11b38a1ca38eaf101c193ea67cd4694f7c49 20-Aug-2013 Narayan Kamath <narayan@google.com> am ec3d1055: Allow certificate inspections after connect.

* commit 'ec3d1055320fee31b7f4d05d6128ba4177aae362':
Allow certificate inspections after connect.
68a95891635423c7d4e84bf9457e68dc53d4b21a 20-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Respect read timeout on recycled connections."
76739264ce52fe7a6c5c3558dad87b649118deff 19-Aug-2013 Narayan Kamath <narayan@google.com> Respect read timeout on recycled connections.

Partial fix for CTS test : URLConnectionTest#testGetKeepAlive.

Change-Id: I1f94ea1a3449440f749264a7696c18663e872b17
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
ec3d1055320fee31b7f4d05d6128ba4177aae362 16-Aug-2013 Narayan Kamath <narayan@google.com> 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

(Cherry picked from 415f345db25a1075e6103e55e7ea735ced0072b)

bug: 10211309

Change-Id: I0bbbc9d394f59df2f86aa35cd368339384770387
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
f8ada025a6d55ad3ac7a4d8fc6766823d5519dd8 19-Aug-2013 Narayan Kamath <narayan@google.com> am bb723bf2: am 8b2bd827: Merge "Allow certificate inspections after connect."

* commit 'bb723bf265032f90be580be1ec17a6623c53ea5d':
Allow certificate inspections after connect.
bb723bf265032f90be580be1ec17a6623c53ea5d 19-Aug-2013 Narayan Kamath <narayan@google.com> am 8b2bd827: Merge "Allow certificate inspections after connect."

* commit '8b2bd827f826fa1b76d28ca18bd16bbd904b83db':
Allow certificate inspections after connect.
8b2bd827f826fa1b76d28ca18bd16bbd904b83db 19-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Allow certificate inspections after connect."
415f345db25a1075e6103e55e7ea735ced0072b9 16-Aug-2013 Narayan Kamath <narayan@google.com> 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

Change-Id: I0bbbc9d394f59df2f86aa35cd368339384770387
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
950c5159cfb20c3afc9c6a5baa040c32a49ebea2 15-Aug-2013 Narayan Kamath <narayan@google.com> Fix HttpsUrlConnection#setDefaultHostnameVerifier.

okhttp uses an internal verifier (an updated version of
DefaultHostnameVerifier) unless a verifier is set on the
client.

Fixes URLConnectionTest#testHttpsWithCustomTrustManager

(cherry picked from 631989e852f3dda9d30547f07cab8ef)

bug: 10211309

Change-Id: I281e1b00382c1c9ccb160f34d5fb79c763c05b70
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
6a25069a9515e1e58cc44b2eb0b22d8ed52bb476 15-Aug-2013 Narayan Kamath <narayan@google.com> am 6459c47f: am 21a51325: Fix HttpsUrlConnection#setDefaultHostnameVerifier.

* commit '6459c47fb3525018dbb6a0c52f8874ef954ce1d8':
Fix HttpsUrlConnection#setDefaultHostnameVerifier.
6459c47fb3525018dbb6a0c52f8874ef954ce1d8 15-Aug-2013 Narayan Kamath <narayan@google.com> am 21a51325: Fix HttpsUrlConnection#setDefaultHostnameVerifier.

* commit '21a513257aad0585e1f3e77c9eba173e0320855a':
Fix HttpsUrlConnection#setDefaultHostnameVerifier.
21a513257aad0585e1f3e77c9eba173e0320855a 15-Aug-2013 Narayan Kamath <narayan@google.com> Fix HttpsUrlConnection#setDefaultHostnameVerifier.

okhttp uses an internal verifier (an updated version of
DefaultHostnameVerifier) unless a verifier is set on the
client.

Fixes URLConnectionTest#testHttpsWithCustomTrustManager

(cherry picked from 631989e852f3dda9d30547f07cab8ef)

bug: 10211309

Change-Id: I281e1b00382c1c9ccb160f34d5fb79c763c05b70
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
fa3f1f4923300d210f7b231f1fc4fa2fe439ed01 15-Aug-2013 Narayan Kamath <narayan@google.com> am f018b6be: am 1c428938: Merge "Fix HttpsUrlConnection#setDefaultHostnameVerifier."

* commit 'f018b6be18e2d7d5fbfd770a70108be757346aab':
Fix HttpsUrlConnection#setDefaultHostnameVerifier.
f018b6be18e2d7d5fbfd770a70108be757346aab 15-Aug-2013 Narayan Kamath <narayan@google.com> am 1c428938: Merge "Fix HttpsUrlConnection#setDefaultHostnameVerifier."

* commit '1c4289380d87faf878b9906b685d69b0b4333b5d':
Fix HttpsUrlConnection#setDefaultHostnameVerifier.
1c4289380d87faf878b9906b685d69b0b4333b5d 15-Aug-2013 Narayan Kamath <narayan@google.com> Merge "Fix HttpsUrlConnection#setDefaultHostnameVerifier."
631989e852f3dda9d30547f07cab8ef24b693ba2 15-Aug-2013 Narayan Kamath <narayan@google.com> Fix HttpsUrlConnection#setDefaultHostnameVerifier.

okhttp uses an internal verifier (an updated version of
DefaultHostnameVerifier) unless a verifier is set on the
client.

Fixes URLConnectionTest#testHttpsWithCustomTrustManager

Change-Id: I281e1b00382c1c9ccb160f34d5fb79c763c05b70
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
dcf44a67bbca7873bf99bc67fa9ab2b656c71029 15-Aug-2013 The Android Open Source Project <initial-contribution@android.com> am 06b878a3: (-s ours) Reconcile with klp-release - do not merge

* commit '06b878a32f0c4da01d2a9cd9b46f3364d0365c77':
Merge "Revert "Revert "Disable SPDY support"""
06b878a32f0c4da01d2a9cd9b46f3364d0365c77 15-Aug-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with klp-release - do not merge

Change-Id: I4e3798658c65d9310a17d45e294c31db6a723a4f
7e7f33909f3a182297414ac61fecd65300a921ba 31-Jul-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
984b512ec00b6e4d8c7c02accd3077fece4b553c 23-Jul-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to master
527ea78938a49edc4532186a869ad528b1fbf73e 23-Jul-2013 Narayan Kamath <narayan@google.com> Merge "Update OkHttp to commit cc4633943800572673c03b32d0b2bc9a08ae184d"
c1acd8e7e5e7da005faacd3e743d075520d36b48 22-Jul-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to master
fb0eb65be9f50e75fa37c250e97914252c587caf 20-Jul-2013 jwilson <jwilson@squareup.com> Update OkHttp to commit cc4633943800572673c03b32d0b2bc9a08ae184d

Change-Id: Iae4b2c5a102cc5341f73593e003af3ee28400cbe
EADME.md
om.xml
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/ConnectionPool.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/test/java/com/squareup/okhttp/ConnectionPoolTest.java
rc/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
rc/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/HttpOverSpdyTest.java
4d31eb4667a86cca81ecf5943b0b61cd1e8d1fae 18-Jul-2013 Elliott Hughes <enh@google.com> Merge "Update okhttp to commit abc8c9a30bc0c5a9a"
a82f42bbeedd0b07f3892f3b0efaa8122dc8f264 18-Jul-2013 Narayan Kamath <narayan@google.com> Update okhttp to commit abc8c9a30bc0c5a9a

Change-Id: I5331e760f09aaae0a267c50829f01eb7a68d76e1
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/Failure.java
rc/main/java/com/squareup/okhttp/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/MediaType.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/OkResponseCache.java
rc/main/java/com/squareup/okhttp/Request.java
rc/main/java/com/squareup/okhttp/Response.java
rc/main/java/com/squareup/okhttp/Route.java
rc/main/java/com/squareup/okhttp/RouteDatabase.java
rc/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/internal/StrictLineReader.java
rc/main/java/com/squareup/okhttp/internal/http/Dispatcher.java
rc/main/java/com/squareup/okhttp/internal/http/HttpDate.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/Job.java
rc/main/java/com/squareup/okhttp/internal/http/OkResponseCache.java
rc/main/java/com/squareup/okhttp/internal/http/OkResponseCacheAdapter.java
rc/main/java/com/squareup/okhttp/internal/http/Policy.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
rc/test/java/com/squareup/okhttp/MediaTypeTest.java
rc/test/java/com/squareup/okhttp/RequestTest.java
rc/test/java/com/squareup/okhttp/internal/AsyncApiTest.java
rc/test/java/com/squareup/okhttp/internal/RecordedResponse.java
rc/test/java/com/squareup/okhttp/internal/RecordingReceiver.java
rc/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rc/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
8ac7bd39f79d4d3d50a6e8d5fdcc8b0297935af5 27-Jun-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to master
00834c9a00d53b29c6e486cb0b6f80fd505416e1 26-Jun-2013 Narayan Kamath <narayan@google.com> Merge "Sync OkHttp to version 1.1.1"
74623587bf099735cf16ec2298005f12fd3fcb07 24-Jun-2013 jwilson <jwilson@squareup.com> Sync OkHttp to version 1.1.1

The new version fixes a handful of behavior and performance
bugs.

Change-Id: I413f9e463fc780aede5da9f3474c1af107bdf45c
rc/main/java/com/squareup/okhttp/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
rc/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
rc/test/java/com/squareup/okhttp/ConnectionPoolTest.java
rc/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
e236cb28288cd3888f281c2c817a0bd3854b93d6 17-Jun-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
3e476a06729d0f23a94a128859ae1968c6d12cde 14-Jun-2013 Narayan Kamath <narayan@google.com> Merge "Update okhttp to commit c84d84d1ca6911534fe993e"
967c738661ae14d2b0a73118fe1e3a755ce58e1b 14-Jun-2013 Narayan Kamath <narayan@google.com> Update okhttp to commit c84d84d1ca6911534fe993e

- Fixes a couple of test cases in URLConnectionTest
related to null header values.
- Fixes a locking related crash observed in tests.

Change-Id: I8c48f29b33e3509d177c5ffb7d8b772dc97d8174
om.xml
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
f663a5363330f46852e0837c2e85baf5c6637634 14-Jun-2013 Narayan Kamath <narayan@google.com> Merge "Don't follow protocol redirects."
bf0942e19906b85a3a061d1e762a4474bef6f1e2 13-Jun-2013 Narayan Kamath <narayan@google.com> Don't follow protocol redirects.

OkHttp allows protocol redirects by default, so turn them
off explicitly.

Also, let HttpsHandler extend HttpHandler so that they can
share code that deals with OkHttpClient initialization.

Change-Id: I890456260571abd40a64ab1647eb4e991f5b1c7e
ndroid/main/java/com/squareup/okhttp/HttpHandler.java
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
46fb83f3095bfdeff14feb0d4c3d40984caa13e7 13-Jun-2013 Narayan Kamath <narayan@google.com> Merge "Update okhttp to commit b48247968a."
faf49723fb689c626f69876e718c58018eff8ee7 06-Jun-2013 Narayan Kamath <narayan@google.com> Update okhttp to commit b48247968a.

Includes mechanism to turn of SPDY on a per request
basis. Leaves SPDY turned off by default.

Change-Id: Ie7a0c7ebfd37d5d2653266e7b6925a2f346323ad
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/Address.java
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/ConnectionPool.java
rc/main/java/com/squareup/okhttp/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/OkAuthenticator.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/OkResponseCache.java
rc/main/java/com/squareup/okhttp/Route.java
rc/main/java/com/squareup/okhttp/internal/AbstractOutputStream.java
rc/main/java/com/squareup/okhttp/internal/DiskLruCache.java
rc/main/java/com/squareup/okhttp/internal/FaultRecoveringOutputStream.java
rc/main/java/com/squareup/okhttp/internal/NamedRunnable.java
rc/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/internal/StrictLineReader.java
rc/main/java/com/squareup/okhttp/internal/Util.java
rc/main/java/com/squareup/okhttp/internal/http/AbstractHttpOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/OkResponseCache.java
rc/main/java/com/squareup/okhttp/internal/http/OkResponseCacheAdapter.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RetryableOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java
rc/main/java/com/squareup/okhttp/internal/tls/DistinguishedNameParser.java
rc/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
rc/test/java/com/squareup/okhttp/ConnectionPoolTest.java
rc/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
rc/test/java/com/squareup/okhttp/internal/FaultRecoveringOutputStreamTest.java
rc/test/java/com/squareup/okhttp/internal/RecordingOkAuthenticator.java
rc/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rc/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
rc/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/HttpOverSpdyTest.java
rc/test/java/com/squareup/okhttp/internal/tls/FakeSSLSession.java
rc/test/java/com/squareup/okhttp/internal/tls/HostnameVerifierTest.java
54ff9d47dc0f5c5f3ed644218d332af846ce7e59 03-Jun-2013 The Android Automerger <android-build@google.com> merge in master-release history after reset to master
5b06e6f38e52c7641a87d90991b07139b4d3dc1f 31-May-2013 Brian Carlstrom <bdc@google.com> Merge "Add a new static library version of okhttp for inclusion in apps"
e7f03919322be5e2fecea46fc149a214ee171839 28-May-2013 Allan Wojciechowski <allanwoj@google.com> Add a new static library version of okhttp for inclusion in apps

$ make okhttp-static

Change-Id: I9f9c82c5fd4a1607ec2765d0488241397b72b7fa
ndroid.mk
7b71a63abd781305282d9dc3782e21d6460bde94 30-May-2013 Brian Carlstrom <bdc@google.com> Merge "Revert "Revert "Disable SPDY support"""
rc/main/java/com/squareup/okhttp/Connection.java
c3e24933514279a86d901ed4d4b6169aa0fdc9c3 30-May-2013 Brian Carlstrom <bdc@google.com> Merge "Revert "Revert "Disable SPDY support"""
e32b06f58e4b01999ef80ca051f8c97a76fa9426 30-May-2013 Brian Carlstrom <bdc@google.com> Revert "Revert "Disable SPDY support""

This reverts commit b1046528f80910a7540435f3a6abb38a391502c4

Bug: 9190726
Change-Id: Ifc3328c2d02752fbb6f2551b9332aa68bbd2aefd
rc/main/java/com/squareup/okhttp/Connection.java
9a5735c94334ca250d5f7f4b215a0277be919fdf 29-May-2013 Kenny Root <kroot@google.com> Merge "Add current AOSP class name for OpenSSLSocketImpl"
5997d62272fee36f585734c510c7ac3cbeb51537 29-May-2013 Kenny Root <kroot@google.com> Add current AOSP class name for OpenSSLSocketImpl

AOSP moved OpenSSLSocketImpl to com.android.org.conscrypt.* so add that
as the first choice for unbundled apps.

Change-Id: I7bad6533dcb86ee1cac3b15f42dd386bd651eaed
rc/main/java/com/squareup/okhttp/internal/Platform.java
7b0345daf2d21c2902e5d43d3ecc5cf333f8cb66 29-May-2013 Narayan Kamath <narayan@google.com> Merge "Revert "Disable SPDY support""
b1046528f80910a7540435f3a6abb38a391502c4 28-May-2013 Allan Wojciechowski <allanwoj@google.com> Revert "Disable SPDY support"

This reverts commit 089e9c1f20b1f7811373d1f99513163a74e53cbe.
rc/main/java/com/squareup/okhttp/Connection.java
2c1c92266ddee7b46d64033741a1201cec534f5f 30-Apr-2013 Kenny Root <kroot@google.com> Merge "Track change to JSSE provider"
ee421d18ac7dec851d74c1a61f78a7e37665988c 24-Apr-2013 Kenny Root <kroot@google.com> Track change to JSSE provider

Change-Id: I93f95fe62d776996d3ea291822f2687133dd3e3c
ndroid.mk
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
09d4e3660325c8d9718f621de61042bc0adf09c1 05-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "Disable SPDY support"
089e9c1f20b1f7811373d1f99513163a74e53cbe 05-Apr-2013 Brian Carlstrom <bdc@google.com> Disable SPDY support

Bug: 8550454
Change-Id: Id16e59789b42e14ebee79309097504a86ec69e5a
rc/main/java/com/squareup/okhttp/Connection.java
e103e20909e0d68147b17338e515d5d3af78a857 04-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "Make okhttp-nojarjar static to keep it off the device"
38381e412237546d0fb3bfe1d96ffc9f1a009c69 04-Apr-2013 Brian Carlstrom <bdc@google.com> Make okhttp-nojarjar static to keep it off the device

Change-Id: I994869692e12e0bcfb731cd67dfd1aaa4601648b
ndroid.mk
e0d8089c39cce6fc211556753126b8c010a9ca0c 04-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "Allow empty header values"
bcbe3a08436629480a207913992a20696e04c25a 04-Apr-2013 Brian Carlstrom <bdc@google.com> Allow empty header values

Change-Id: I78bb07a93d527eda6aaee6e986be39a68e0a02f4
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
c14ab20a39d74d4911cf7677e2a55115c718e60e 03-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "Add build for okhttp-tests"
d935f3138d9c22e7372201ec627a830cdf92d299 03-Apr-2013 Brian Carlstrom <bdc@google.com> Add build for okhttp-tests

Change-Id: Ic31f65dd8a916faf620713ec28e2c258e7476457
ndroid.mk
04ecb7ed736bb505f4204c13251988e28400c953 02-Apr-2013 Brian Carlstrom <bdc@google.com> Merge "okhttp should depend on only core.jar, not frameworks.jar"
cd5fb67d2de8a4d8b2688a54ec4c39cc8220573f 02-Apr-2013 Brian Carlstrom <bdc@google.com> okhttp should depend on only core.jar, not frameworks.jar

Change-Id: I673a50ea5258bdc5c76d4fb8914d047ddc02684f
ndroid.mk
4873ac811d513b4cec15f678b7d0ef35d8d12955 20-Feb-2013 Narayan Kamath <narayan@google.com> Merge "Update okhttp through to Feb 20."
7407d6984ce69693097befc9b72609a8156463bb 20-Feb-2013 Narayan Kamath <narayan@google.com> Update okhttp through to Feb 20.

This is commit 4b7e0b733fe7597bd58014311cbed8592ca313ac
on branch master at

https://github.com/square/okhttp

Change-Id: I68c40a8a0c7518933b6ac124c886d21f4823a809
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/ConnectionPool.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/internal/NamedRunnable.java
rc/main/java/com/squareup/okhttp/internal/Util.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rc/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
cf335d418ba2340c2a3cd28038b6cc38a9679b6e 01-Feb-2013 Brian Carlstrom <bdc@google.com> Merge "Upgrade to the latest OkHttp, with changes through 2013-Feb-01."
54cf3446000fdcf88a9e62724f7deb0282e98da1 18-Jan-2013 jwilson <jwilson@squareup.com> Upgrade to the latest OkHttp, with changes through 2013-Feb-01.

This is OkHttp commit 2137b7a72518cfac088757ef6d0fb3d085bf6e3d
Most notable changes are improvements to ConnectionPool (fixing
infinite loops!) and upgrading to SPDY/3.

Change-Id: Icd9e5e3857a45f9b68a164b920d33f48cdddb780
EADME.md
heckstyle.xml
om.xml
rc/main/java/com/squareup/okhttp/Address.java
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/ConnectionPool.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/OkResponseCache.java
rc/main/java/com/squareup/okhttp/ResponseSource.java
rc/main/java/com/squareup/okhttp/TunnelRequest.java
rc/main/java/com/squareup/okhttp/internal/Base64.java
rc/main/java/com/squareup/okhttp/internal/DiskLruCache.java
rc/main/java/com/squareup/okhttp/internal/Dns.java
rc/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/internal/StrictLineReader.java
rc/main/java/com/squareup/okhttp/internal/Util.java
rc/main/java/com/squareup/okhttp/internal/http/AbstractHttpInputStream.java
rc/main/java/com/squareup/okhttp/internal/http/AbstractHttpOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/HeaderParser.java
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
rc/main/java/com/squareup/okhttp/internal/http/HttpDate.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RetryableOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/main/java/com/squareup/okhttp/internal/http/Transport.java
rc/main/java/com/squareup/okhttp/internal/http/UnknownLengthHttpInputStream.java
rc/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
rc/main/java/com/squareup/okhttp/internal/spdy/Ping.java
rc/main/java/com/squareup/okhttp/internal/spdy/Settings.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyWriter.java
rc/main/java/com/squareup/okhttp/internal/spdy/Threads.java
rc/test/java/com/squareup/okhttp/ConnectionPoolTest.java
rc/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
rc/test/java/com/squareup/okhttp/internal/RecordingAuthenticator.java
rc/test/java/com/squareup/okhttp/internal/RecordingHostnameVerifier.java
rc/test/java/com/squareup/okhttp/internal/SslContextBuilder.java
rc/test/java/com/squareup/okhttp/internal/StrictLineReaderTest.java
rc/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
rc/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rc/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
rc/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
rc/test/java/com/squareup/okhttp/internal/mockspdyserver/MockSpdyServer.java
rc/test/java/com/squareup/okhttp/internal/spdy/HttpOverSpdyTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
rc/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/SpdyServer.java
5f7fde35d881e7e9f8850daeac4de52265635656 14-Jan-2013 Brian Carlstrom <bdc@google.com> Merge "Upgrade to the latest OkHttp."
2231db3e6bb54447a9b14cf004a6cb03c373651c 26-Dec-2012 jwilson <jwilson@squareup.com> Upgrade to the latest OkHttp.

Note the internal package name has changed from libcore.net.http
to com.squareup.okhttp.

Change-Id: Ib0eb4bdd69f24f2a255975460bd001e59657ddcc
ndroid.mk
ndroid/main/java/com/squareup/okhttp/HttpHandler.java
ndroid/main/java/com/squareup/okhttp/HttpsHandler.java
ndroid/main/java/com/squareup/okhttp/internal/Platform.java
ndroid/main/java/libcore/util/Libcore.java
arjar-rules.txt
rc/main/java/com/squareup/okhttp/Address.java
rc/main/java/com/squareup/okhttp/Connection.java
rc/main/java/com/squareup/okhttp/ConnectionPool.java
rc/main/java/com/squareup/okhttp/OkHttpClient.java
rc/main/java/com/squareup/okhttp/OkHttpConnection.java
rc/main/java/com/squareup/okhttp/OkHttpsConnection.java
rc/main/java/com/squareup/okhttp/OkResponseCache.java
rc/main/java/com/squareup/okhttp/ResponseSource.java
rc/main/java/com/squareup/okhttp/TunnelRequest.java
rc/main/java/com/squareup/okhttp/internal/Base64.java
rc/main/java/com/squareup/okhttp/internal/DiskLruCache.java
rc/main/java/com/squareup/okhttp/internal/Dns.java
rc/main/java/com/squareup/okhttp/internal/Platform.java
rc/main/java/com/squareup/okhttp/internal/StrictLineReader.java
rc/main/java/com/squareup/okhttp/internal/Util.java
rc/main/java/com/squareup/okhttp/internal/http/AbstractHttpInputStream.java
rc/main/java/com/squareup/okhttp/internal/http/AbstractHttpOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/HeaderParser.java
rc/main/java/com/squareup/okhttp/internal/http/HttpAuthenticator.java
rc/main/java/com/squareup/okhttp/internal/http/HttpDate.java
rc/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
rc/main/java/com/squareup/okhttp/internal/http/HttpResponseCache.java
rc/main/java/com/squareup/okhttp/internal/http/HttpTransport.java
rc/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.java
rc/main/java/com/squareup/okhttp/internal/http/RawHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/ResponseHeaders.java
rc/main/java/com/squareup/okhttp/internal/http/RetryableOutputStream.java
rc/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
rc/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
rc/main/java/com/squareup/okhttp/internal/http/Transport.java
rc/main/java/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.java
rc/main/java/com/squareup/okhttp/internal/spdy/Ping.java
rc/main/java/com/squareup/okhttp/internal/spdy/Settings.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java
rc/main/java/com/squareup/okhttp/internal/spdy/SpdyWriter.java
rc/main/java/com/squareup/okhttp/internal/spdy/Threads.java
rc/main/java/libcore/io/AsynchronousCloseMonitor.java
rc/main/java/libcore/io/Base64.java
rc/main/java/libcore/io/BufferIterator.java
rc/main/java/libcore/io/DiskLruCache.java
rc/main/java/libcore/io/IoUtils.java
rc/main/java/libcore/io/OsConstants.java
rc/main/java/libcore/io/SizeOf.java
rc/main/java/libcore/io/Streams.java
rc/main/java/libcore/io/StrictLineReader.java
rc/main/java/libcore/net/MimeUtils.java
rc/main/java/libcore/net/http/AbstractHttpInputStream.java
rc/main/java/libcore/net/http/AbstractHttpOutputStream.java
rc/main/java/libcore/net/http/Challenge.java
rc/main/java/libcore/net/http/HeaderParser.java
rc/main/java/libcore/net/http/HttpAuthenticator.java
rc/main/java/libcore/net/http/HttpConnection.java
rc/main/java/libcore/net/http/HttpConnectionPool.java
rc/main/java/libcore/net/http/HttpDate.java
rc/main/java/libcore/net/http/HttpEngine.java
rc/main/java/libcore/net/http/HttpResponseCache.java
rc/main/java/libcore/net/http/HttpTransport.java
rc/main/java/libcore/net/http/HttpURLConnectionImpl.java
rc/main/java/libcore/net/http/HttpsHandler.java
rc/main/java/libcore/net/http/HttpsURLConnectionImpl.java
rc/main/java/libcore/net/http/RawHeaders.java
rc/main/java/libcore/net/http/RequestHeaders.java
rc/main/java/libcore/net/http/ResponseHeaders.java
rc/main/java/libcore/net/http/RetryableOutputStream.java
rc/main/java/libcore/net/http/SpdyTransport.java
rc/main/java/libcore/net/http/Transport.java
rc/main/java/libcore/net/spdy/IncomingStreamHandler.java
rc/main/java/libcore/net/spdy/Ping.java
rc/main/java/libcore/net/spdy/Settings.java
rc/main/java/libcore/net/spdy/SpdyConnection.java
rc/main/java/libcore/net/spdy/SpdyReader.java
rc/main/java/libcore/net/spdy/SpdyServer.java
rc/main/java/libcore/net/spdy/SpdyStream.java
rc/main/java/libcore/net/spdy/SpdyWriter.java
rc/main/java/libcore/net/spdy/Threads.java
rc/main/java/libcore/util/BasicLruCache.java
rc/main/java/libcore/util/Charsets.java
rc/main/java/libcore/util/CollectionUtils.java
rc/main/java/libcore/util/DefaultFileNameMap.java
rc/main/java/libcore/util/EmptyArray.java
rc/main/java/libcore/util/ExtendedResponseCache.java
rc/main/java/libcore/util/IntegralToString.java
rc/main/java/libcore/util/Libcore.java
rc/main/java/libcore/util/MutableBoolean.java
rc/main/java/libcore/util/MutableByte.java
rc/main/java/libcore/util/MutableChar.java
rc/main/java/libcore/util/MutableDouble.java
rc/main/java/libcore/util/MutableFloat.java
rc/main/java/libcore/util/MutableInt.java
rc/main/java/libcore/util/MutableLong.java
rc/main/java/libcore/util/MutableShort.java
rc/main/java/libcore/util/Objects.java
rc/main/java/libcore/util/ResponseSource.java
rc/main/java/libcore/util/SneakyThrow.java
rc/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
rc/test/java/com/squareup/okhttp/internal/SslContextBuilder.java
rc/test/java/com/squareup/okhttp/internal/StrictLineReaderTest.java
rc/test/java/com/squareup/okhttp/internal/http/ExternalSpdyExample.java
rc/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
rc/test/java/com/squareup/okhttp/internal/http/RawHeadersTest.java
rc/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/http/URLEncodingTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/MockSpdyPeer.java
rc/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java
rc/test/java/com/squareup/okhttp/internal/spdy/SpdyServer.java
rc/test/java/libcore/io/DiskLruCacheTest.java
rc/test/java/libcore/io/StrictLineReaderTest.java
rc/test/java/libcore/net/http/ExternalSpdyExample.java
rc/test/java/libcore/net/http/HttpResponseCacheTest.java
rc/test/java/libcore/net/http/NewURLConnectionTest.java
rc/test/java/libcore/net/http/RawHeadersTest.java
rc/test/java/libcore/net/http/URLConnectionTest.java
rc/test/java/libcore/net/spdy/MockSpdyPeer.java
rc/test/java/libcore/net/spdy/SettingsTest.java
rc/test/java/libcore/net/spdy/SpdyConnectionTest.java
rc/test/java/libcore/net/ssl/SslContextBuilder.java
abe10a6415358d66bb0d1ac3145c8909a327a54d 13-Nov-2012 Narayan Kamath <narayan@google.com> Merge "Update okhttp to the latest version."
7899c5ab935cf542069835ec7d3e457db596dbf7 09-Nov-2012 Narayan Kamath <narayan@google.com> Update okhttp to the latest version.

This is the version on okhttp master
commit 21e9c8398867f983e8c3cf29c6382690c1e4785d

Change-Id: I4332ee63741c8784eb00b63d636780ae3408b1e9
ONTRIBUTING.md
EADME.android
EADME.md
ndroid/main/java/libcore/util/Libcore.java
heckstyle.xml
om.xml
rc/main/java/com/squareup/okhttp/OkHttpsConnection.java
rc/main/java/libcore/io/DiskLruCache.java
rc/main/java/libcore/io/StrictLineReader.java
rc/main/java/libcore/net/http/HeaderParser.java
rc/main/java/libcore/net/http/HttpAuthenticator.java
rc/main/java/libcore/net/http/HttpConnection.java
rc/main/java/libcore/net/http/HttpConnectionPool.java
rc/main/java/libcore/net/http/HttpEngine.java
rc/main/java/libcore/net/http/HttpResponseCache.java
rc/main/java/libcore/net/http/HttpTransport.java
rc/main/java/libcore/net/http/HttpURLConnectionImpl.java
rc/main/java/libcore/net/http/HttpsURLConnectionImpl.java
rc/main/java/libcore/net/http/RawHeaders.java
rc/main/java/libcore/net/http/ResponseHeaders.java
rc/main/java/libcore/net/http/SpdyTransport.java
rc/main/java/libcore/net/spdy/Ping.java
rc/main/java/libcore/net/spdy/Settings.java
rc/main/java/libcore/net/spdy/SpdyConnection.java
rc/main/java/libcore/net/spdy/SpdyReader.java
rc/main/java/libcore/net/spdy/SpdyServer.java
rc/main/java/libcore/net/spdy/SpdyStream.java
rc/main/java/libcore/net/spdy/SpdyWriter.java
rc/main/java/libcore/net/spdy/Threads.java
rc/main/java/libcore/util/ExtendedResponseCache.java
rc/main/java/libcore/util/Libcore.java
rc/test/java/libcore/io/DiskLruCacheTest.java
rc/test/java/libcore/io/StrictLineReaderTest.java
rc/test/java/libcore/net/http/HttpResponseCacheTest.java
rc/test/java/libcore/net/http/RawHeadersTest.java
rc/test/java/libcore/net/http/URLConnectionTest.java
rc/test/java/libcore/net/spdy/MockSpdyPeer.java
rc/test/java/libcore/net/spdy/SettingsTest.java
rc/test/java/libcore/net/spdy/SpdyConnectionTest.java
975568b5b9bdfdb3fe76359d13eba0f0babca7be 04-Sep-2012 Brian Carlstrom <bdc@google.com> Merge "Remove usage of setEnabledCompressionMethods"
3c4b370017fca07a59c1047f58dc382f4ff45eba 03-Sep-2012 Narayan Kamath <narayan@google.com> Remove usage of setEnabledCompressionMethods

Change-Id: Ia8a6b5b2d3cba15ff82b5d13f7efcba86d22630e
ndroid/main/java/libcore/util/Libcore.java
b9d888ea54ab05c420263de584767d05ac9c6ac7 17-Aug-2012 Narayan Kamath <narayan@google.com> Merge "Fix usage DeflaterOutputStream constructor on android"
9542e750421542d4dea1f1d33c0f4349b3c48536 15-Aug-2012 Narayan Kamath <narayan@google.com> Fix usage DeflaterOutputStream constructor on android

This API is hidden and unbundled apps that attempt to use
it on android will not compile. Also added a
LOCAL_SDK_VERSION to the make file to ensure that it can
compile against an SDK. All uses of hidden / private APIs are now
in Libcore.java so this should make it easier for us to move
forward with building an interface for okhttp to use these
APIs.

Change-Id: Ie7fc097b84445d55745a94ce048dd46590887d80
ndroid.mk
ndroid/main/java/libcore/util/Libcore.java
rc/main/java/libcore/net/spdy/SpdyWriter.java
rc/main/java/libcore/util/Libcore.java
9d3a6713f14f04184ff8854b241b6c515ff8c0b8 10-Aug-2012 Brian Carlstrom <bdc@google.com> Merge "Add makefile + jarjar rule for okhttp."
153d0953fe0df254bf3ffaa56934c97020b86edb 09-Aug-2012 Narayan Kamath <narayan@google.com> Add makefile + jarjar rule for okhttp.

Created a new path android/ that contains android
specific patches to this code. This is not a long term approach,
simply a stop gap measure to get this codebase compiling and usable
under android. For now, this path contains changes to Libcore.java
to remove OpenJDK dependencies.

This patchset also updates the snapshot to upstream revision
2a05f0e18f0ae67.

Change-Id: Ic1ef8245109e07c7cf9f59c1e7881b86d357d74f
ndroid.mk
EADME.android
ndroid/main/java/libcore/util/Libcore.java
arjar-rules.txt
rc/main/java/libcore/util/Libcore.java
25222bf623d513f2487c1ee17aae8cf592318bc6 09-Aug-2012 Brian Carlstrom <bdc@google.com> Merge "Initial checkin for okhttp."
c3f6f16bd4a2338e88275641b9f2f56e816ca377 09-Aug-2012 Narayan Kamath <narayan@google.com> Initial checkin for okhttp.

This is a snapshot of the okhttp git repository at commit
d6ac2b9819831db4b08e1da9c8b4abff2bcca379.

This change does not contain an Android.mk file or build rules.
These will be added in a dependant change.

Change-Id: I99cf2f5566dd202b0028b3eb0773ea6fecfe1173
ICENSE.txt
ODULE_LICENSE_APACHE2
EADME.android
EADME.md
heckstyle.xml
om.xml
rc/main/java/com/squareup/okhttp/OkHttpConnection.java
rc/main/java/com/squareup/okhttp/OkHttpsConnection.java
rc/main/java/libcore/io/AsynchronousCloseMonitor.java
rc/main/java/libcore/io/Base64.java
rc/main/java/libcore/io/BufferIterator.java
rc/main/java/libcore/io/DiskLruCache.java
rc/main/java/libcore/io/IoUtils.java
rc/main/java/libcore/io/OsConstants.java
rc/main/java/libcore/io/SizeOf.java
rc/main/java/libcore/io/Streams.java
rc/main/java/libcore/net/MimeUtils.java
rc/main/java/libcore/net/http/AbstractHttpInputStream.java
rc/main/java/libcore/net/http/AbstractHttpOutputStream.java
rc/main/java/libcore/net/http/Challenge.java
rc/main/java/libcore/net/http/HeaderParser.java
rc/main/java/libcore/net/http/HttpConnection.java
rc/main/java/libcore/net/http/HttpConnectionPool.java
rc/main/java/libcore/net/http/HttpDate.java
rc/main/java/libcore/net/http/HttpEngine.java
rc/main/java/libcore/net/http/HttpResponseCache.java
rc/main/java/libcore/net/http/HttpTransport.java
rc/main/java/libcore/net/http/HttpURLConnectionImpl.java
rc/main/java/libcore/net/http/HttpsHandler.java
rc/main/java/libcore/net/http/HttpsURLConnectionImpl.java
rc/main/java/libcore/net/http/RawHeaders.java
rc/main/java/libcore/net/http/RequestHeaders.java
rc/main/java/libcore/net/http/ResponseHeaders.java
rc/main/java/libcore/net/http/RetryableOutputStream.java
rc/main/java/libcore/net/http/SpdyTransport.java
rc/main/java/libcore/net/http/Transport.java
rc/main/java/libcore/net/spdy/IncomingStreamHandler.java
rc/main/java/libcore/net/spdy/SpdyConnection.java
rc/main/java/libcore/net/spdy/SpdyReader.java
rc/main/java/libcore/net/spdy/SpdyServer.java
rc/main/java/libcore/net/spdy/SpdyStream.java
rc/main/java/libcore/net/spdy/SpdyWriter.java
rc/main/java/libcore/net/spdy/Threads.java
rc/main/java/libcore/util/BasicLruCache.java
rc/main/java/libcore/util/Charsets.java
rc/main/java/libcore/util/CollectionUtils.java
rc/main/java/libcore/util/DefaultFileNameMap.java
rc/main/java/libcore/util/EmptyArray.java
rc/main/java/libcore/util/ExtendedResponseCache.java
rc/main/java/libcore/util/IntegralToString.java
rc/main/java/libcore/util/Libcore.java
rc/main/java/libcore/util/MutableBoolean.java
rc/main/java/libcore/util/MutableByte.java
rc/main/java/libcore/util/MutableChar.java
rc/main/java/libcore/util/MutableDouble.java
rc/main/java/libcore/util/MutableFloat.java
rc/main/java/libcore/util/MutableInt.java
rc/main/java/libcore/util/MutableLong.java
rc/main/java/libcore/util/MutableShort.java
rc/main/java/libcore/util/Objects.java
rc/main/java/libcore/util/ResponseSource.java
rc/main/java/libcore/util/SneakyThrow.java
rc/test/java/libcore/net/http/ExternalSpdyExample.java
rc/test/java/libcore/net/http/NewURLConnectionTest.java
rc/test/java/libcore/net/http/URLConnectionTest.java
rc/test/java/libcore/net/spdy/MockSpdyPeer.java
rc/test/java/libcore/net/spdy/SpdyConnectionTest.java
rc/test/java/libcore/net/ssl/SslContextBuilder.java
7a1ebf3e89e87f0130a3fd257e7cbb6a44c7cbf2 02-Aug-2012 Ed Heyl <edheyl@google.com> Initial empty repository