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

auto merge of #2406 : Ms2ger/servo/http_loader-load, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-05-12 14:22:55 -04:00
commit c6274f9793
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/net/http_loader.rs
View file

@ -9,7 +9,6 @@ use http::client::{RequestWriter, NetworkStream};
use http::method::Get; use http::method::Get;
use http::headers::HeaderEnum; use http::headers::HeaderEnum;
use std::io::Reader; use std::io::Reader;
use std::slice;
use servo_util::task::spawn_named; use servo_util::task::spawn_named;
use url::Url; use url::Url;
@ -96,14 +95,13 @@ fn load(mut url: Url, start_chan: Sender<LoadResponse>) {
let progress_chan = start_sending(start_chan, metadata); let progress_chan = start_sending(start_chan, metadata);
loop { loop {
let mut buf = slice::with_capacity(1024); let mut buf = Vec::with_capacity(1024);
unsafe { buf.set_len(1024); } unsafe { buf.set_len(1024); }
match response.read(buf) { match response.read(buf.as_mut_slice()) {
Ok(len) => { Ok(len) => {
unsafe { buf.set_len(len); } unsafe { buf.set_len(len); }
let buf: ~[u8] = buf; progress_chan.send(Payload(buf));
progress_chan.send(Payload(buf.move_iter().collect()));
} }
Err(_) => { Err(_) => {
progress_chan.send(Done(Ok(()))); progress_chan.send(Done(Ok(())));