When an individual entry is lost from the appache's diskcache, attempts to lo...

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/base/net_log.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.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),
-      cache_id_(kNoCacheId),
-      is_fallback_(false),
+      cache_id_(kNoCacheId), is_fallback_(false),
+      cache_entry_not_found_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(read_callback_(
           this, &AppCacheURLRequestJob::OnReadComplete)) {
   DCHECK(storage_);
 }
 
 AppCacheURLRequestJob::~AppCacheURLRequestJob() {
   if (storage_)
     storage_->CancelDelegateCallbacks(this);
 }
 
@@ skipping 77 matching lines @@
   if (response_info) {
     info_ = response_info;
     reader_.reset(
         storage_->CreateResponseReader(manifest_url_, entry_.response_id()));
 
     if (is_range_request())
       SetupRangeResponse();
 
     NotifyHeadersComplete();
   } else {
-    NotifyStartError(
-        URLRequestStatus(URLRequestStatus::FAILED, net::ERR_FAILED));
+    // A resource that is expected to be in the appcache is missing.
+    // See http://code.google.com/p/chromium/issues/detail?id=50657
+    // Instead of failing the request, we restart the request. The retry
+    // attempt will fallthru to the network instead of trying to load
+    // from the appcache.
+    cache_entry_not_found_ = true;
+    NotifyRestartRequired();
   }
   storage_ = NULL;  // no longer needed
 }
 
 const net::HttpResponseInfo* AppCacheURLRequestJob::http_info() const {
   if (!info_.get())
     return NULL;
   if (range_response_info_.get())
     return range_response_info_.get();
   return info_->http_response_info();
@@ skipping 129 matching lines @@
   }
 
   // If multiple ranges are requested, we play dumb and
   // return the entire response with 200 OK.
   if (ranges.size() == 1U)
     range_requested_ = ranges[0];
 }
 
 }  // namespace appcache