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

Avoid deadlock in main_fetch

Browse source
This commit is contained in:
Keith Yeung 2016-09-14 10:59:17 -07:00
parent 07c9cfecec
commit 6fbd2aa5b7
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/net/fetch/methods.rs
View file

@ -361,13 +361,14 @@ fn main_fetch(request: Rc<Request>, cache: &mut CORSCache, cors_flag: bool,
} }
} }
} else if let Some(ref mut target) = *target { } else if let Some(ref mut target) = *target {
if let ResponseBody::Done(ref vec) = *response.body.lock().unwrap() { 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 // in case there was no channel to wait for, the body was
// obtained synchronously via basic_fetch for data/file/about/etc // obtained synchronously via basic_fetch for data/file/about/etc
// We should still send the body across as a chunk // We should still send the body across as a chunk
target.process_response_chunk(vec.clone()); target.process_response_chunk(vec.clone());
} else { } else {
assert!(*response.body.lock().unwrap() == ResponseBody::Empty) assert!(*body == ResponseBody::Empty)
} }
} }