Merge 32707 - Http cache: Make sure that when we cancel a request for...

net/http/http_cache_transaction.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_cache_transaction.h"
 
 #include "base/compiler_specific.h"
 
 #if defined(OS_POSIX)
 #include <unistd.h>
@@ skipping 440 matching lines @@
       NOTREACHED();
       rv = ERR_FAILED;
   }
   return rv;
 }
 
 bool HttpCache::Transaction::AddTruncatedFlag() {
   DCHECK(mode_ & WRITE);
 
   // Don't set the flag for sparse entries.
-  if (partial_.get())
+  if (partial_.get() && !truncated_)
     return true;
 
   // Double check that there is something worth keeping.
   if (!entry_->disk_entry->GetDataSize(kResponseContentIndex))
     return false;
 
   truncated_ = true;
   WriteResponseInfoToEntry(true);
   return true;
 }
@@ skipping 898 matching lines @@
 void HttpCache::Transaction::OnCacheWriteCompleted(int result) {
   DoCacheWriteCompleted(result);
 }
 
 void HttpCache::Transaction::OnCacheEntryReady(int result) {
   DCHECK_EQ(OK, result);
   ValidateEntryHeadersAndContinue(true);
 }
 
 }  // namespace net