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

Correctly handle flag local_urls_only

Browse source 
In function Request::fetch_main, flag local_urls_only (if set)
should allow fetching local urls only. Before this change, the flag had
the inverse behaviour.
This commit is contained in:
Stjepan Glavina 2016-03-23 18:01:43 +01:00
parent ef8d36d208
commit 6576fde29b
3 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/net/fetch/methods.rs
View file

@ -110,11 +110,8 @@ fn main_fetch(request: Rc<Request>, cors_flag: bool, recursive_flag: bool) -> Re
let mut response = None;
// Step 2
if request.local_urls_only {
match &*request.current_url().scheme {
"about" | "blob" | "data" | "filesystem" => response = Some(Response::network_error()),
_ => { }
};
if request.local_urls_only && !url_is_local(&request.current_url()) {
response = Some(Response::network_error());
}
// Step 3
@ -1047,6 +1044,13 @@ fn includes_credentials(url: &Url) -> bool {
false
}
fn url_is_local(url: &Url) -> bool {
match &*url.scheme {
"about" | "blob" | "data" | "filesystem" => true,
_ => false
}
}
fn response_needs_revalidation(_response: &Response) -> bool {
// TODO this function
false

6
components/net_traits/request.rs
View file

@ -152,7 +152,7 @@ impl Request {
pub fn new(url: Url,
origin: Option<Origin>,
is_service_worker_global_scope: bool) -> Request {
Request {
Request {
method: RefCell::new(Method::Get),
local_urls_only: false,
sandboxed_storage_area_urls: false,
@ -257,4 +257,8 @@ impl Request {
_ => false
}
}
pub fn set_local_urls_only(&mut self, local_urls_only: bool) {
self.local_urls_only = local_urls_only;
}
}