Merge 33919 - Http cache: Don't use multiple validation headers when...

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 894 matching lines @@
   if (!etag_value.empty()) {
     if (partial_.get() && !partial_->IsCurrentRangeCached()) {
       // We don't want to switch to WRITE mode if we don't have this block of a
       // byte-range request because we may have other parts cached.
       custom_request_->extra_headers.append("If-Range: ");
     } else {
       custom_request_->extra_headers.append("If-None-Match: ");
     }
     custom_request_->extra_headers.append(etag_value);
     custom_request_->extra_headers.append("\r\n");
-    if (partial_.get() && partial_->IsCurrentRangeCached())
+    // For byte-range requests, make sure that we use only one way to validate
+    // the request.
+    if (partial_.get())
       return true;
   }
 
   if (!last_modified_value.empty()) {
     if (partial_.get() && !partial_->IsCurrentRangeCached()) {
       custom_request_->extra_headers.append("If-Range: ");
     } else {
       custom_request_->extra_headers.append("If-Modified-Since: ");
     }
     custom_request_->extra_headers.append(last_modified_value);
@@ skipping 471 matching lines @@
 void HttpCache::Transaction::OnCacheWriteCompleted(int result) {
   DoCacheWriteCompleted(result);
 }
 
 void HttpCache::Transaction::OnCacheEntryReady(int result) {
   DCHECK_EQ(OK, result);
   ValidateEntryHeadersAndContinue(true);
 }
 
 }  // namespace net