diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2016-11-07 10:08:16 +0100 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2016-11-10 13:17:02 +0100 |
| commit | c1e1695f66d4778b374926d443826936c18a58f0 (patch) | |
| tree | 73e7e1cc22fc5c894b8dc9c9ace64631df17422e /components/net/fetch/methods.rs | |
| parent | 89c46369a209462ff38eeb4316ab5fd970c1c5c3 (diff) | |
| download | servo-c1e1695f66d4778b374926d443826936c18a58f0.tar.gz servo-c1e1695f66d4778b374926d443826936c18a58f0.zip | |
Pass the URL to Response::new().
Diffstat (limited to 'components/net/fetch/methods.rs')
| -rw-r--r-- | components/net/fetch/methods.rs | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index eba6481f236..72d7e5c1e2a 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -409,9 +409,7 @@ fn basic_fetch<UI: 'static + UIProvider>(request: Rc<Request>, match url.scheme() { "about" if url.path() == "blank" => { - let mut response = Response::new(); - // https://github.com/whatwg/fetch/issues/312 - response.url = Some(url); + let mut response = Response::new(url); response.headers.set(ContentType(mime!(Text / Html; Charset = Utf8))); *response.body.lock().unwrap() = ResponseBody::Done(vec![]); response @@ -425,9 +423,7 @@ fn basic_fetch<UI: 'static + UIProvider>(request: Rc<Request>, if *request.method.borrow() == Method::Get { match decode(&url) { Ok((mime, bytes)) => { - let mut response = Response::new(); - // https://github.com/whatwg/fetch/issues/312 - response.url = Some(url.clone()); + let mut response = Response::new(url); *response.body.lock().unwrap() = ResponseBody::Done(bytes); response.headers.set(ContentType(mime)); response @@ -449,9 +445,7 @@ fn basic_fetch<UI: 'static + UIProvider>(request: Rc<Request>, let _ = file.read_to_end(&mut bytes); let mime = guess_mime_type(file_path); - let mut response = Response::new(); - // https://github.com/whatwg/fetch/issues/312 - response.url = Some(url.clone()); + let mut response = Response::new(url); *response.body.lock().unwrap() = ResponseBody::Done(bytes); response.headers.set(ContentType(mime)); response @@ -475,8 +469,7 @@ fn basic_fetch<UI: 'static + UIProvider>(request: Rc<Request>, match load_blob_sync(url.clone(), context.filemanager.clone()) { Ok((headers, bytes)) => { - let mut response = Response::new(); - response.url = Some(url.clone()); + let mut response = Response::new(url); response.headers = headers; *response.body.lock().unwrap() = ResponseBody::Done(bytes); response @@ -1028,8 +1021,7 @@ fn http_network_fetch<UI: 'static + UIProvider>(request: Rc<Request>, } }; - let mut response = Response::new(); - response.url = Some(url.clone()); + let mut response = Response::new(url.clone()); response.status = Some(res.response.status); response.raw_status = Some((res.response.status_raw().0, res.response.status_raw().1.as_bytes().to_vec())); |