Index: net/http/http_cache_transaction.cc |
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc |
index e2d46be45350eec82cb3ec0850f1e792f17e98f2..b74843178081d854483c1d2f90b9e422734f93ed 100644 |
--- a/net/http/http_cache_transaction.cc |
+++ b/net/http/http_cache_transaction.cc |
@@ -1200,7 +1200,34 @@ int HttpCache::Transaction::DoAddToEntry() { |
net_log_.BeginEvent(NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY); |
DCHECK(entry_lock_waiting_since_.is_null()); |
entry_lock_waiting_since_ = TimeTicks::Now(); |
- return cache_->AddTransactionToEntry(new_entry_, this); |
+ |
+ int result = cache_->AddTransactionToEntry(new_entry_, this); |
+ |
+ // If we're a range request and we're blocked by the reader/writer lock, then |
+ // we'll switch to pass-through mode, this eliminates a long-running issue |
+ // (crbug.com/31014) where two of the same video resource could not be played |
+ // back simultaneously due to one locking the cache entry until the entire |
+ // video was downloaded. |
+ // |
+ // This is not an ideal solution, as we are now ignoring the cache entirely |
+ // for all range requests to a resource beyond the first. This is however a |
+ // much more succinct solution than the alternatives, which would require |
+ // somewhat significant changes to the http caching logic. |
+ // TODO(rileya): Support simultaneous transactions on sparse cache entries, |
+ // and remove this hack (crbug.com/362215). |
+ if (partial_ && result == net::ERR_IO_PENDING) { |
rvargas (doing something else)
2014/04/22 00:44:31
Why giving up on trying to see if the lock owner i
rileya (GONE FROM CHROMIUM)
2014/04/23 17:45:05
I was thinking that we could be blocked by either
rvargas (doing something else)
2014/04/23 18:56:54
yeah, I've been going back and forth about this. I
|
+ entry_lock_waiting_since_ = TimeTicks(); |
+ net_log_.EndEvent(NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY); |
+ mode_ = NONE; |
+ partial_->RestoreHeaders(&custom_request_->extra_headers); |
+ partial_.reset(); |
+ next_state_ = STATE_SEND_REQUEST; |
+ cache_pending_ = false; |
+ new_entry_->pending_queue.pop_front(); |
rvargas (doing something else)
2014/04/22 00:44:31
cache_->RemovePendingTransaction(this);
rileya (GONE FROM CHROMIUM)
2014/04/23 17:45:05
Done.
|
+ new_entry_ = entry_ = NULL; |
rvargas (doing something else)
2014/04/22 00:44:31
entry_ should be NULL already.
rileya (GONE FROM CHROMIUM)
2014/04/23 17:45:05
Ahh, alright, removed setting it.
|
+ return OK; |
+ } |
+ return result; |
} |
int HttpCache::Transaction::DoAddToEntryComplete(int result) { |