From e75e8afa0cf126ca22e403874a22249d51b86219 Mon Sep 17 00:00:00 2001 From: "rvargas@google.com" Date: Tue, 3 Nov 2009 00:04:20 +0000 Subject: Http cache: Always preserve extra headers when dealing with byte range requests. BUG=25755 TEST=unittests Review URL: http://codereview.chromium.org/339088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30773 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/partial_data.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'net/http/partial_data.cc') diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc index 128c5b7..162948c 100644 --- a/net/http/partial_data.cc +++ b/net/http/partial_data.cc @@ -22,8 +22,7 @@ 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 ranges; if (!HttpUtil::ParseRanges(headers, &ranges) || ranges.size() != 1) return false; @@ -33,13 +32,16 @@ bool PartialData::Init(const std::string& headers, 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() ? -- cgit v1.1