Http cache: Always preserve extra headers when dealing with...

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"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 namespace {
 
 // The headers that we have to process.
 const char kLengthHeader[] = "Content-Length";
 const char kRangeHeader[] = "Content-Range";
 const int kDataStream = 1;
 
 }
 
 namespace net {
 
-bool PartialData::Init(const std::string& headers,
-                       const std::string& new_headers) {
+bool PartialData::Init(const std::string& headers) {
   std::vector<HttpByteRange> ranges;
   if (!HttpUtil::ParseRanges(headers, &ranges) || ranges.size() != 1)
     return false;
 
   // We can handle this range request.
   byte_range_ = ranges[0];
   if (!byte_range_.IsValid())
     return false;
 
-  extra_headers_ = new_headers;
   resource_size_ = 0;
-
   current_range_start_ = byte_range_.first_byte_position();
   return true;
 }
 
+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);
 }
 
 int PartialData::PrepareCacheValidation(disk_cache::Entry* entry,
                                         std::string* headers) {
@@ skipping 257 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