summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-11-07 22:55:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 22:55:33 +0000
commit1987bdc2583b6e360a9bb8e1953e353753e88282 (patch)
tree45b07ed3f668f2b90d32ab7fb181125cdd53ca92
parent56888a2a22df994197e64cf4f1e9ed6c008a37f0 (diff)
parent5b5df6e7e71528cc046410746b529bc5243e74a0 (diff)
downloadandroid_packages_providers_DownloadProvider-1987bdc2583b6e360a9bb8e1953e353753e88282.tar.gz
android_packages_providers_DownloadProvider-1987bdc2583b6e360a9bb8e1953e353753e88282.tar.bz2
android_packages_providers_DownloadProvider-1987bdc2583b6e360a9bb8e1953e353753e88282.zip
am 5b5df6e7: am 83cf6d5b: Defeat connection reuse to really cancel.
* commit '5b5df6e7e71528cc046410746b529bc5243e74a0': 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);