Merge r7669 into 154 branch:...

net/http/http_cache.cc

 // Copyright (c) 2006-2008 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/http_cache.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 1227 matching lines @@
   // We do this before calling EntryAvailable to force any further calls to
   // AddTransactionToEntry to add their transaction to the pending queue, which
   // ensures FIFO ordering.
   if (!entry->pending_queue.empty())
     ProcessPendingQueue(entry);
 
   return trans->EntryAvailable(entry);
 }
 
 void HttpCache::DoneWithEntry(ActiveEntry* entry, Transaction* trans) {
-  // If we already posted a task to move on to the next transaction, there is
-  // nothing to cancel.
-  if (entry->will_process_pending_queue)
+  // If we already posted a task to move on to the next transaction and this was
+  // the writer, there is nothing to cancel.
+  if (entry->will_process_pending_queue && entry->readers.empty())
     return;
 
   if (entry->writer) {
     // TODO(rvargas): convert this to a DCHECK.
     CHECK(trans == entry->writer);
     // Assume that this is not a successful write.
     DoneWritingToEntry(entry, false);
   } else {
     DoneReadingFromEntry(entry, trans);
   }
@@ skipping 99 matching lines @@
 
   entry->pending_queue.erase(entry->pending_queue.begin());
 
   AddTransactionToEntry(entry, next);
 }
 
 //-----------------------------------------------------------------------------
 
 }  // namespace net