Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Unified Diff: content/browser/download/download_item_impl.cc

Issue 2832223004: interrupt and resume download with CONTENT_LENGTH_MISMATCH errors (Closed)
Patch Set: fix tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/download/download_item_impl.cc
diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc
index 6bc0b6e9b9864971181cbaad4a222f76465a592f..1132560218034b46a8b1e4f9f82f8c51bc726877 100644
--- a/content/browser/download/download_item_impl.cc
+++ b/content/browser/download/download_item_impl.cc
@@ -937,6 +937,7 @@ DownloadItemImpl::ResumeMode DownloadItemImpl::GetResumeMode() const {
switch(last_reason_) {
case DOWNLOAD_INTERRUPT_REASON_FILE_TRANSIENT_ERROR:
case DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT:
+ case DOWNLOAD_INTERRUPT_REASON_SERVER_CONTENT_LENGTH_MISMATCH:
break;
case DOWNLOAD_INTERRUPT_REASON_SERVER_NO_RANGE:
@@ -1106,6 +1107,17 @@ void DownloadItemImpl::OnAllDataSaved(
// the download and don't expect to receive any more
// data.
+ if (received_bytes_at_length_mismatch > 0) {
+ if (total_bytes > received_bytes_at_length_mismatch) {
+ RecordDownloadCount(
+ MORE_BYTES_RECEIVED_AFTER_CONTENT_LENGTH_MISMATCH_COUNT);
+ } else if (total_bytes == received_bytes_at_length_mismatch) {
+ RecordDownloadCount(
+ NO_BYTES_RECEIVED_AFTER_CONTENT_LENGTH_MISMATCH_COUNT);
+ } else {
+ // This could happen if the content changes on the server.
+ }
+ }
DVLOG(20) << __func__ << "() download=" << DebugString(true);
UpdateObservers();
}
@@ -1796,6 +1808,9 @@ void DownloadItemImpl::InterruptWithPartialState(
RecordDownloadInterrupted(reason, received_bytes_, total_bytes_,
job_ && job_->IsParallelizable(),
IsParallelDownloadEnabled());
+ if (reason == DOWNLOAD_INTERRUPT_REASON_SERVER_CONTENT_LENGTH_MISMATCH)
+ received_bytes_at_length_mismatch = received_bytes_;
+
if (!GetWebContents())
RecordDownloadCount(INTERRUPTED_WITHOUT_WEBCONTENTS);
« no previous file with comments | « content/browser/download/download_item_impl.h ('k') | content/browser/download/download_item_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698