aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/fetch/methods.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/net/fetch/methods.rs')
-rw-r--r--components/net/fetch/methods.rs19
1 files changed, 11 insertions, 8 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 1f3eb0e5a24..a97ee2e9985 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -312,15 +312,18 @@ fn main_fetch(request: Rc<Request>, cache: &mut CORSCache, cors_flag: bool,
Data::Done => break,
}
}
- } else if let ResponseBody::Done(ref vec) = *response.body.lock().unwrap() {
- // in case there was no channel to wait for, the body was
- // obtained synchronously via basic_fetch for data/file/about/etc
- // We should still send the body across as a chunk
- if let Some(ref mut target) = *target {
- target.process_response_chunk(vec.clone());
- }
} else {
- assert!(*response.body.lock().unwrap() == ResponseBody::Empty)
+ let body = response.body.lock().unwrap();
+ if let ResponseBody::Done(ref vec) = *body {
+ // in case there was no channel to wait for, the body was
+ // obtained synchronously via basic_fetch for data/file/about/etc
+ // We should still send the body across as a chunk
+ if let Some(ref mut target) = *target {
+ target.process_response_chunk(vec.clone());
+ }
+ } else {
+ assert!(*body == ResponseBody::Empty)
+ }
}
// overloaded similarly to process_response