Fix a regression with satisfying range requests out of the appcache and add a...

webkit/appcache/appcache_url_request_job.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 <vector>
 
 #include "webkit/appcache/appcache_url_request_job.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
+#include "net/http/http_request_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_status.h"
 
 namespace appcache {
 
 AppCacheURLRequestJob::AppCacheURLRequestJob(
     URLRequest* request, AppCacheStorage* storage)
     : URLRequestJob(request), storage_(storage),
       has_been_started_(false), has_been_killed_(false),
       delivery_type_(AWAITING_DELIVERY_ORDERS),
@@ skipping 214 matching lines @@
   DCHECK(is_delivering_appcache_response());
   DCHECK_NE(buf_size, 0);
   DCHECK(bytes_read);
   DCHECK(!reader_->IsReadPending());
   reader_->ReadData(buf, buf_size, &read_callback_);
   SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
   return false;
 }
 
 void AppCacheURLRequestJob::SetExtraRequestHeaders(
-    const std::string& headers) {
+    const net::HttpRequestHeaders& headers) {
+  std::string value;
+  std::vector<net::HttpByteRange> ranges;
+  if (!headers.GetHeader(net::HttpRequestHeaders::kRange, &value) ||
+      !net::HttpUtil::ParseRangeHeader(value, &ranges)) {
+    return;
+  }
+
   // If multiple ranges are requested, we play dumb and
   // return the entire response with 200 OK.
-  std::vector<net::HttpByteRange> ranges;
-  if (!net::HttpUtil::ParseRanges(headers, &ranges) || (ranges.size() > 1U))
-    return;
-  range_requested_ = ranges[0];
+  if (ranges.size() == 1U)
+    range_requested_ = ranges[0];
 }
 
 }  // namespace appcache