auto merge of #4000 : t29/servo/mime-sniffing, r=jdm

Issue: #3144

This PR addresses the second step of the ticket. i.e. move from a 1:1 sniffer:request task model to a shared sniffer task.

1 files changed, 2 insertions, 2 deletions

diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index d647df64d13..7e199fad1d3 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -200,13 +200,13 @@ pub fn parse_html(page: &Page,
         InputUrl(ref url) => {
             // Wait for the LoadResponse so that the parser knows the final URL.
             let (input_chan, input_port) = channel();
-            let mut load_data = LoadData::new(url.clone());
+            let mut load_data = LoadData::new(url.clone(), input_chan);
             msg_load_data.map(|m| {
                 load_data.headers = m.headers;
                 load_data.method = m.method;
                 load_data.data = m.data;
             });
-            resource_task.send(Load(load_data, input_chan));
+            resource_task.send(Load(load_data));
 
             let load_response = input_port.recv();