Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

fetch: ensure consistency between response, done-chan, and cache state.

Browse source
This commit is contained in:
Gregory Terzian 2019-10-09 13:05:18 +08:00
parent ec408e9a57
commit bb1fa88864
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/net/http_loader.rs
View file

@ -1092,20 +1092,6 @@ fn http_network_or_cache_fetch(
response_from_cache.needs_validation, response_from_cache.needs_validation,
), ),
}; };
if cached_response.is_none() {
// Ensure the done chan is not set if we're not using the cached response,
// as the cache might have set it to Some if it constructed a pending response.
*done_chan = None;
// Update the cache state, incrementing the pending store count,
// or starting the count.
if let HttpCacheEntryState::PendingStore(i) = *state {
let new = i + 1;
*state = HttpCacheEntryState::PendingStore(new);
} else {
*state = HttpCacheEntryState::PendingStore(1);
}
}
if needs_revalidation { if needs_revalidation {
revalidating_flag = true; revalidating_flag = true;
// Substep 5 // Substep 5
@ -1124,6 +1110,20 @@ fn http_network_or_cache_fetch(
// Substep 6 // Substep 6
response = cached_response; response = cached_response;
} }
if response.is_none() {
// Ensure the done chan is not set if we're not using the cached response,
// as the cache might have set it to Some if it constructed a pending response.
*done_chan = None;
// Update the cache state, incrementing the pending store count,
// or starting the count.
if let HttpCacheEntryState::PendingStore(i) = *state {
let new = i + 1;
*state = HttpCacheEntryState::PendingStore(new);
} else {
*state = HttpCacheEntryState::PendingStore(1);
}
}
} }
} }
// Notify the next thread waiting in line, if there is any. // Notify the next thread waiting in line, if there is any.
@ -1223,6 +1223,9 @@ fn http_network_or_cache_fetch(
.map_or(false, |s| s.0 == StatusCode::NOT_MODIFIED) .map_or(false, |s| s.0 == StatusCode::NOT_MODIFIED)
{ {
if let Ok(mut http_cache) = context.state.http_cache.write() { if let Ok(mut http_cache) = context.state.http_cache.write() {
// Ensure done_chan is None,
// since the network response will be replaced by the revalidated stored one.
*done_chan = None;
response = http_cache.refresh(&http_request, forward_response.clone(), done_chan); response = http_cache.refresh(&http_request, forward_response.clone(), done_chan);
wait_for_cached_response(done_chan, &mut response); wait_for_cached_response(done_chan, &mut response);
} }