diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-11-10 22:35:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 22:35:56 +0000 |
commit | c83a3a844ec0c3d7a000fbf26a181bff1ddeb8a3 (patch) | |
tree | 535d5b140830c012fa893ce19ccf2ee04970d1cd | |
parent | 1987bdc2583b6e360a9bb8e1953e353753e88282 (diff) | |
parent | 0a910e216a08af574707f82ce865753e26ed8dda (diff) | |
download | android_packages_providers_DownloadProvider-c83a3a844ec0c3d7a000fbf26a181bff1ddeb8a3.tar.gz android_packages_providers_DownloadProvider-c83a3a844ec0c3d7a000fbf26a181bff1ddeb8a3.tar.bz2 android_packages_providers_DownloadProvider-c83a3a844ec0c3d7a000fbf26a181bff1ddeb8a3.zip |
am 0a910e21: Connection: close is enough to know length. automerge: 0032d17
* commit '0a910e216a08af574707f82ce865753e26ed8dda':
Connection: close is enough to know length.
-rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index c0f5a5e9..2493adaf 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -439,12 +439,16 @@ public class DownloadThread implements Runnable { */ private void transferData(HttpURLConnection conn) throws StopRequestException { - // To detect when we're really finished, we either need a length or - // chunked encoding. + // To detect when we're really finished, we either need a length, closed + // connection, or chunked encoding. final boolean hasLength = mInfoDelta.mTotalBytes != -1; - final String transferEncoding = conn.getHeaderField("Transfer-Encoding"); - final boolean isChunked = "chunked".equalsIgnoreCase(transferEncoding); - if (!hasLength && !isChunked) { + final boolean isConnectionClose = "close".equalsIgnoreCase( + conn.getHeaderField("Connection")); + final boolean isEncodingChunked = "chunked".equalsIgnoreCase( + conn.getHeaderField("Transfer-Encoding")); + + final boolean finishKnown = hasLength || isConnectionClose || isEncodingChunked; + if (!finishKnown) { throw new StopRequestException( STATUS_CANNOT_RESUME, "can't know size of download, giving up"); } |