diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-12 18:59:58 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-12 18:59:58 +0530 |
| commit | 4848e37e2e0da2f83b1d7f0d231d59047012ff95 (patch) | |
| tree | 91b7822b53e3f7c940c403b106a10e0202b4f434 /components/script/script_task.rs | |
| parent | 743ca24819490c24ab3cf713fc9fdcd0f58957e0 (diff) | |
| parent | c4cf72db6e69cda90f4ad98933da95cead7da243 (diff) | |
| download | servo-4848e37e2e0da2f83b1d7f0d231d59047012ff95.tar.gz servo-4848e37e2e0da2f83b1d7f0d231d59047012ff95.zip | |
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 -->
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 99312a61bd6..a824c3fb3dd 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -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); } |