Inverts conditional and returns

This commit is contained in:
Sam Gibson 2015-08-27 18:40:08 +12:00
parent 1811ffa178
commit d8acb893de

View file

@ -272,9 +272,11 @@ pub enum LoadError {
} }
fn set_default_accept_encoding(headers: &mut Headers) { fn set_default_accept_encoding(headers: &mut Headers) {
if !headers.has::<AcceptEncoding>() { if headers.has::<AcceptEncoding>() {
headers.set_raw("Accept-Encoding".to_owned(), vec![b"gzip, deflate".to_vec()]); return
} }
headers.set_raw("Accept-Encoding".to_owned(), vec![b"gzip, deflate".to_vec()]);
} }
fn set_default_accept(headers: &mut Headers) { fn set_default_accept(headers: &mut Headers) {
@ -323,25 +325,27 @@ fn request_must_be_secured(url: &Url, resource_mgr_chan: &IpcSender<ControlMsg>)
} }
fn update_sts_list_from_response(url: &Url, response: &HttpResponse, resource_mgr_chan: &IpcSender<ControlMsg>) { fn update_sts_list_from_response(url: &Url, response: &HttpResponse, resource_mgr_chan: &IpcSender<ControlMsg>) {
if url.scheme == "https" { if url.scheme != "https" {
if let Some(header) = response.headers().get::<StrictTransportSecurity>() { return;
if let Some(host) = url.domain() { }
info!("adding host {} to the strict transport security list", host);
info!("- max-age {}", header.max_age);
let include_subdomains = if header.include_subdomains { if let Some(header) = response.headers().get::<StrictTransportSecurity>() {
info!("- includeSubdomains"); if let Some(host) = url.domain() {
IncludeSubdomains::Included info!("adding host {} to the strict transport security list", host);
} else { info!("- max-age {}", header.max_age);
IncludeSubdomains::NotIncluded
};
resource_mgr_chan.send( let include_subdomains = if header.include_subdomains {
ControlMsg::SetHSTSEntryForHost( info!("- includeSubdomains");
host.to_string(), include_subdomains, header.max_age IncludeSubdomains::Included
) } else {
).unwrap(); IncludeSubdomains::NotIncluded
} };
resource_mgr_chan.send(
ControlMsg::SetHSTSEntryForHost(
host.to_string(), include_subdomains, header.max_age
)
).unwrap();
} }
} }
} }