mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
auto merge of #2406 : Ms2ger/servo/http_loader-load, r=jdm
This commit is contained in:
commit
c6274f9793
1 changed files with 3 additions and 5 deletions
|
@ -9,7 +9,6 @@ use http::client::{RequestWriter, NetworkStream};
|
|||
use http::method::Get;
|
||||
use http::headers::HeaderEnum;
|
||||
use std::io::Reader;
|
||||
use std::slice;
|
||||
use servo_util::task::spawn_named;
|
||||
use url::Url;
|
||||
|
||||
|
@ -96,14 +95,13 @@ fn load(mut url: Url, start_chan: Sender<LoadResponse>) {
|
|||
|
||||
let progress_chan = start_sending(start_chan, metadata);
|
||||
loop {
|
||||
let mut buf = slice::with_capacity(1024);
|
||||
let mut buf = Vec::with_capacity(1024);
|
||||
|
||||
unsafe { buf.set_len(1024); }
|
||||
match response.read(buf) {
|
||||
match response.read(buf.as_mut_slice()) {
|
||||
Ok(len) => {
|
||||
unsafe { buf.set_len(len); }
|
||||
let buf: ~[u8] = buf;
|
||||
progress_chan.send(Payload(buf.move_iter().collect()));
|
||||
progress_chan.send(Payload(buf));
|
||||
}
|
||||
Err(_) => {
|
||||
progress_chan.send(Done(Ok(())));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue