forked from mirrors/gecko-dev
f66935aba8
Most are simple refactoring, cleanups and improvements, but still involving two slightly notable changes: + In `filemanager`, now we read the file content based on requested `RelativePos` by `seek` and `read_exact` (rather than `read_to_end` then do slicing). This strategy might be again adjusted in future performance tuning but certainly better than nothing. + Also, I cached more file meta-info in both sides and left a block of comment on `filemanager`'s file reading mentioning the snapshot-state problem (not solved now though). r? @Manishearth <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 665559556f5aeac5820e17684b14311aa3767c0c
56 lines
2.1 KiB
Rust
56 lines
2.1 KiB
Rust
/* 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 http://mozilla.org/MPL/2.0/. */
|
|
|
|
use hyper::header::{DispositionType, ContentDisposition, DispositionParam};
|
|
use hyper::header::{Headers, ContentType, ContentLength, Charset};
|
|
use hyper::http::RawStatus;
|
|
use mime::{Mime, Attr};
|
|
use mime_classifier::MimeClassifier;
|
|
use net_traits::ProgressMsg::Done;
|
|
use net_traits::blob_url_store::BlobBuf;
|
|
use net_traits::response::HttpsState;
|
|
use net_traits::{LoadConsumer, LoadData, Metadata};
|
|
use resource_thread::start_sending_sniffed_opt;
|
|
use std::sync::Arc;
|
|
|
|
// TODO: Check on GET
|
|
// https://w3c.github.io/FileAPI/#requestResponseModel
|
|
|
|
pub fn load_blob(load_data: LoadData, start_chan: LoadConsumer,
|
|
classifier: Arc<MimeClassifier>, blob_buf: BlobBuf) {
|
|
let content_type: Mime = blob_buf.type_string.parse().unwrap_or(mime!(Text / Plain));
|
|
let charset = content_type.get_param(Attr::Charset);
|
|
|
|
let mut headers = Headers::new();
|
|
|
|
if let Some(name) = blob_buf.filename {
|
|
let charset = charset.and_then(|c| c.as_str().parse().ok());
|
|
headers.set(ContentDisposition {
|
|
disposition: DispositionType::Inline,
|
|
parameters: vec![
|
|
DispositionParam::Filename(charset.unwrap_or(Charset::Us_Ascii),
|
|
None, name.as_bytes().to_vec())
|
|
]
|
|
});
|
|
}
|
|
|
|
headers.set(ContentType(content_type.clone()));
|
|
headers.set(ContentLength(blob_buf.size as u64));
|
|
|
|
let metadata = Metadata {
|
|
final_url: load_data.url.clone(),
|
|
content_type: Some(ContentType(content_type.clone())),
|
|
charset: charset.map(|c| c.as_str().to_string()),
|
|
headers: Some(headers),
|
|
// https://w3c.github.io/FileAPI/#TwoHundredOK
|
|
status: Some(RawStatus(200, "OK".into())),
|
|
https_state: HttpsState::None,
|
|
};
|
|
|
|
if let Ok(chan) =
|
|
start_sending_sniffed_opt(start_chan, metadata, classifier,
|
|
&blob_buf.bytes, load_data.context.clone()) {
|
|
let _ = chan.send(Done(Ok(())));
|
|
}
|
|
}
|