aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-10-03 19:36:21 -0400
committerGitHub <noreply@github.com>2019-10-03 19:36:21 -0400
commitbbc94d256c65402afd435c17a3f6c6aaf021342f (patch)
tree5e353567222bd657dfc8624dcc526ed2be8d5901
parentc2052437dc59e77aea4f2a6316164c6c1a7204de (diff)
parent2156ed7ab281e7e6b39a66c58e37828294d2d64b (diff)
downloadservo-bbc94d256c65402afd435c17a3f6c6aaf021342f.tar.gz
servo-bbc94d256c65402afd435c17a3f6c6aaf021342f.zip
Auto merge of #24356 - servo:jdm-patch-30, r=paulrouget
Use unfiltered response body when replicating body of cached responses. The amount of time it took me to track this down makes me wonder if there would be a better way of representing response bodies and filtered responses. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24350 - [ ] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24356) <!-- Reviewable:end -->
-rw-r--r--components/net/http_cache.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/components/net/http_cache.rs b/components/net/http_cache.rs
index 4f751405d75..d31adc4f36d 100644
--- a/components/net/http_cache.rs
+++ b/components/net/http_cache.rs
@@ -669,7 +669,9 @@ impl HttpCache {
/// Updating consumers who received a response constructed with a ResponseBody::Receiving.
pub fn update_awaiting_consumers(&mut self, request: &Request, response: &Response) {
- if let ResponseBody::Done(ref completed_body) = *response.body.lock().unwrap() {
+ if let ResponseBody::Done(ref completed_body) =
+ *response.actual_response().body.lock().unwrap()
+ {
let entry_key = CacheKey::new(request.clone());
if let Some(cached_resources) = self.entries.get(&entry_key) {
// Ensure we only wake-up consumers of relevant resources,