Merge 33412 - Http cache: Add code to restart a network request when the...

net/http/partial_data.cc

 // Copyright (c) 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/partial_data.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
@@ skipping 29 matching lines @@
 void PartialData::SetHeaders(const std::string& headers) {
   DCHECK(extra_headers_.empty());
   extra_headers_ = headers;
 }
 
 void PartialData::RestoreHeaders(std::string* headers) const {
   DCHECK(current_range_start_ >= 0 || byte_range_.IsSuffixByteRange());
   int64 end = byte_range_.IsSuffixByteRange() ?
               byte_range_.suffix_length() : byte_range_.last_byte_position();
 
-  AddRangeHeader(current_range_start_, end, headers);
+  headers->assign(extra_headers_);
+  if (byte_range_.IsValid())
+    AddRangeHeader(current_range_start_, end, headers);
 }
 
 int PartialData::PrepareCacheValidation(disk_cache::Entry* entry,
                                         std::string* headers) {
   DCHECK(current_range_start_ >= 0);
 
   // Scan the disk cache for the first cached portion within this range.
   int64 range_len = byte_range_.HasLastBytePosition() ?
       byte_range_.last_byte_position() - current_range_start_ + 1 : kint32max;
   if (range_len > kint32max)
@@ skipping 251 matching lines @@
   if (start >= 0)
     my_start = Int64ToString(start);
   if (end >= 0)
     my_end = Int64ToString(end);
 
   headers->append(StringPrintf("Range: bytes=%s-%s\r\n", my_start.c_str(),
                                my_end.c_str()));
 }
 
 }  // namespace net