Auto merge of #7844 - Wafflespeanut:requests, r=jdm

Cancelable network requests!

fixes #4974

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7844)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-12 18:59:58 +05:30
commit 4848e37e2e
11 changed files with 250 additions and 53 deletions

View file

@ -1963,7 +1963,7 @@ impl ScriptTask {
data: load_data.data,
cors: None,
pipeline_id: Some(id),
}, LoadConsumer::Listener(response_target))).unwrap();
}, LoadConsumer::Listener(response_target), None)).unwrap();
self.incomplete_loads.borrow_mut().push(incomplete);
}