aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/blob_loader.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-11-26 10:34:31 -0500
committerGitHub <noreply@github.com>2018-11-26 10:34:31 -0500
commitd282618baac130a95e7b4a6f9d99312f35401dab (patch)
tree59013df1fdff12f4ebd3312f68d97a1c6acf2c43 /components/net/blob_loader.rs
parent7c65505df3fff47f43062da20088113631ed9ae0 (diff)
parentb23dd0587b5d31d34915fc3906e550d05108a185 (diff)
downloadservo-d282618baac130a95e7b4a6f9d99312f35401dab.tar.gz
servo-d282618baac130a95e7b4a6f9d99312f35401dab.zip
Auto merge of #22134 - ferjm:load_better_blob, r=jdm
Support range requests for blob URLs - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #21467 and fix #22053 - [X] There are tests for these changes. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22134) <!-- Reviewable:end -->
Diffstat (limited to 'components/net/blob_loader.rs')
-rw-r--r--components/net/blob_loader.rs108
1 files changed, 0 insertions, 108 deletions
diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs
deleted file mode 100644
index e6d64acc16e..00000000000
--- a/components/net/blob_loader.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use crate::filemanager_thread::FileManager;
-use headers_core::HeaderMapExt;
-use headers_ext::{ContentLength, ContentType};
-use http::header::{self, HeaderValue};
-use http::HeaderMap;
-use ipc_channel::ipc;
-use mime::{self, Mime};
-use net_traits::blob_url_store::parse_blob_url;
-use net_traits::filemanager_thread::ReadFileProgress;
-use net_traits::{http_percent_encode, NetworkError};
-use servo_url::ServoUrl;
-
-// TODO: Check on GET
-// https://w3c.github.io/FileAPI/#requestResponseModel
-
-/// https://fetch.spec.whatwg.org/#concept-basic-fetch (partial)
-// TODO: make async.
-pub fn load_blob_sync(
- url: ServoUrl,
- filemanager: FileManager,
-) -> Result<(HeaderMap, Vec<u8>), NetworkError> {
- let (id, origin) = match parse_blob_url(&url) {
- Ok((id, origin)) => (id, origin),
- Err(()) => {
- let e = format!("Invalid blob URL format {:?}", url);
- return Err(NetworkError::Internal(e));
- },
- };
-
- let (sender, receiver) = ipc::channel().unwrap();
- let check_url_validity = true;
- filemanager.read_file(sender, id, check_url_validity, origin);
-
- let blob_buf = match receiver.recv().unwrap() {
- Ok(ReadFileProgress::Meta(blob_buf)) => blob_buf,
- Ok(_) => {
- return Err(NetworkError::Internal(
- "Invalid filemanager reply".to_string(),
- ));
- },
- Err(e) => {
- return Err(NetworkError::Internal(format!("{:?}", e)));
- },
- };
-
- let content_type: Mime = blob_buf.type_string.parse().unwrap_or(mime::TEXT_PLAIN);
- let charset = content_type.get_param(mime::CHARSET);
-
- let mut headers = HeaderMap::new();
-
- if let Some(name) = blob_buf.filename {
- let charset = charset
- .map(|c| c.as_ref().into())
- .unwrap_or("us-ascii".to_owned());
- // TODO(eijebong): Replace this once the typed header is there
- headers.insert(
- header::CONTENT_DISPOSITION,
- HeaderValue::from_bytes(
- format!(
- "inline; {}",
- if charset.to_lowercase() == "utf-8" {
- format!(
- "filename=\"{}\"",
- String::from_utf8(name.as_bytes().into()).unwrap()
- )
- } else {
- format!(
- "filename*=\"{}\"''{}",
- charset,
- http_percent_encode(name.as_bytes())
- )
- }
- )
- .as_bytes(),
- )
- .unwrap(),
- );
- }
-
- // Basic fetch, Step 4.
- headers.typed_insert(ContentLength(blob_buf.size as u64));
- // Basic fetch, Step 5.
- headers.typed_insert(ContentType::from(content_type.clone()));
-
- let mut bytes = blob_buf.bytes;
- loop {
- match receiver.recv().unwrap() {
- Ok(ReadFileProgress::Partial(ref mut new_bytes)) => {
- bytes.append(new_bytes);
- },
- Ok(ReadFileProgress::EOF) => {
- return Ok((headers, bytes));
- },
- Ok(_) => {
- return Err(NetworkError::Internal(
- "Invalid filemanager reply".to_string(),
- ));
- },
- Err(e) => {
- return Err(NetworkError::Internal(format!("{:?}", e)));
- },
- }
- }
-}