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

Set response status for range requests to file and blob urls

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-11-15 06:45:13 +01:00
parent b96e5681aa
commit 79d27cb7ca
5 changed files with 96 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

42
components/net/filemanager_thread.rs
View file

@ -114,18 +114,16 @@ impl FileManager {
origin: FileOrigin,
response: &mut Response,
range: RangeRequestBounds,
) -> Result<(), String> {
self.store
.fetch_blob_buf(
done_sender,
cancellation_listener,
&id,
&origin,
range,
check_url_validity,
response,
)
.map_err(|e| format!("{:?}", e))
) -> Result<(), BlobURLStoreError> {
self.store.fetch_blob_buf(
done_sender,
cancellation_listener,
&id,
&origin,
range,
check_url_validity,
response,
)
}
pub fn promote_memory(
@ -539,7 +537,13 @@ impl FileManagerStore {
let file_impl = self.get_impl(id, origin_in, check_url_validity)?;
match file_impl {
FileImpl::Memory(buf) => {
let range = range.get_final(Some(buf.size));
let range = match range.get_final(Some(buf.size)) {
Ok(range) => range,
Err(_) => {
return Err(BlobURLStoreError::InvalidRange);
},
};
let range = range.to_abs_range(buf.size as usize);
let len = range.len() as u64;
@ -568,7 +572,13 @@ impl FileManagerStore {
let file = File::open(&metadata.path)
.map_err(|e| BlobURLStoreError::External(e.to_string()))?;
let range = range.get_final(Some(metadata.size));
let range = match range.get_final(Some(metadata.size)) {
Ok(range) => range,
Err(_) => {
return Err(BlobURLStoreError::InvalidRange);
},
};
let mut reader = BufReader::with_capacity(FILE_CHUNK_SIZE, file);
if reader.seek(SeekFrom::Start(range.start as u64)).is_err() {
return Err(BlobURLStoreError::External(
@ -607,7 +617,9 @@ impl FileManagerStore {
cancellation_listener,
&parent_id,
origin_in,
RangeRequestBounds::Final(range.get_final(None).slice_inner(&inner_rel_pos)),
RangeRequestBounds::Final(
RelativePos::full_range().slice_inner(&inner_rel_pos),
),
false,
response,
);