summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-11-07 23:01:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 23:01:01 +0000
commit9d424fb0e9096a7d670bfd915b09ef2a46323cc4 (patch)
tree7a9f9624dd067e00556318fdb8ee49f6b8a7ea20
parent59405a181ad8fcf34ee194bb86f580ade1ae0233 (diff)
parent1987bdc2583b6e360a9bb8e1953e353753e88282 (diff)
downloadandroid_packages_providers_DownloadProvider-9d424fb0e9096a7d670bfd915b09ef2a46323cc4.tar.gz
android_packages_providers_DownloadProvider-9d424fb0e9096a7d670bfd915b09ef2a46323cc4.tar.bz2
android_packages_providers_DownloadProvider-9d424fb0e9096a7d670bfd915b09ef2a46323cc4.zip
am 1987bdc2: am 5b5df6e7: am 83cf6d5b: Defeat connection reuse to really cancel.
* commit '1987bdc2583b6e360a9bb8e1953e353753e88282': Defeat connection reuse to really cancel.
-rw-r--r--src/com/android/providers/downloads/DownloadThread.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 51e71b27..c0f5a5e9 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -792,6 +792,10 @@ public class DownloadThread implements Runnable {
// easily resume partial downloads.
conn.setRequestProperty("Accept-Encoding", "identity");
+ // Defeat connection reuse, since otherwise servers may continue
+ // streaming large downloads after cancelled.
+ conn.setRequestProperty("Connection", "close");
+
if (resuming) {
if (mInfoDelta.mETag != null) {
conn.addRequestProperty("If-Match", mInfoDelta.mETag);