Cleanup: have common HttpResponseHeaders routine to update with range

net/http/http_util.cc

 // Copyright (c) 2012 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.
 
 // The rules for parsing content-types were borrowed from Firefox:
 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
 
 #include "net/http/http_util.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
+#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
+#include "net/http/http_response_headers.h"
 
 using std::string;
 
 namespace net {
 
 //-----------------------------------------------------------------------------
 
 // Return the index of the closing quote of the string, if any.
 static size_t FindStringEnd(const string& line, size_t start, char delim) {
   DCHECK(start < line.length() && line[start] == delim &&
@@ skipping 252 matching lines @@
 
     // Do a final check on the HttpByteRange object.
     if (!range.IsValid())
       return false;
     ranges->push_back(range);
   }
   return !ranges->empty();
 }
 
 // static
+bool HttpUtil::UpdateResponseHeadersWithRange(
+    const HttpByteRange& byte_range,
+    int64 resource_size,
+    bool replace_status_line,
+    HttpResponseHeaders* headers) {
+  DCHECK(headers);
+  if (!byte_range.IsValid())

[rvargas (doing something else), 2014/03/05 19:47:33]

We should probably dcheck this and return void... the callers are not checking
the return value. 

[kinuko, 2014/03/06 04:11:29]

Done.

+    return false;
+
+  const char kLengthHeader[] = "Content-Length";
+  const char kRangeHeader[] = "Content-Range";
+
+  headers->RemoveHeader(kLengthHeader);
+  headers->RemoveHeader(kRangeHeader);
+
+  int64 start = byte_range.first_byte_position();
+  int64 end = byte_range.last_byte_position();
+  int64 range_len = end - start + 1;
+
+  if (replace_status_line)
+    headers->ReplaceStatusLine("HTTP/1.1 206 Partial Content");
+
+  headers->AddHeader(
+      base::StringPrintf("%s: bytes %" PRId64 "-%" PRId64 "/%" PRId64,
+                         kRangeHeader, start, end, resource_size));
+  headers->AddHeader(
+      base::StringPrintf("%s: %" PRId64, kLengthHeader, range_len));
+  return true;
+}
+
+// static
 bool HttpUtil::HasHeader(const std::string& headers, const char* name) {
   size_t name_len = strlen(name);
   string::const_iterator it =
       std::search(headers.begin(),
                   headers.end(),
                   name,
                   name + name_len,
                   base::CaseInsensitiveCompareASCII<char>());
   if (it == headers.end())
     return false;
@@ skipping 609 matching lines @@
       value_is_quoted_ = true;
       // Do not store iterators into this. See declaration of unquoted_value_.
       unquoted_value_ = HttpUtil::Unquote(value_begin_, value_end_);
     }
   }
 
   return true;
 }
 
 }  // namespace net