diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2016-04-21 00:18:37 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2016-04-23 20:27:58 +0200 |
| commit | 7932ab6ac2646e097a2ef2f76d6e4439fe53bdd3 (patch) | |
| tree | d486c090f3287be1036f2aea0f544b65ec95d43e /components/net/hsts.rs | |
| parent | 305c283602882850be9d39c43b980d0fc0f93a3c (diff) | |
| download | servo-7932ab6ac2646e097a2ef2f76d6e4439fe53bdd3.tar.gz servo-7932ab6ac2646e097a2ef2f76d6e4439fe53bdd3.zip | |
Upgrade to rust-url 1.0 and hyper 0.9
Diffstat (limited to 'components/net/hsts.rs')
| -rw-r--r-- | components/net/hsts.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/components/net/hsts.rs b/components/net/hsts.rs index 8bbecb86eb1..b64b797c754 100644 --- a/components/net/hsts.rs +++ b/components/net/hsts.rs @@ -122,13 +122,11 @@ impl HstsList { } pub fn secure_url(url: &Url) -> Url { - if &*url.scheme == "http" { + if url.scheme() == "http" { let mut secure_url = url.clone(); - secure_url.scheme = "https".to_owned(); - secure_url.relative_scheme_data_mut() - .map(|scheme_data| { - scheme_data.default_port = Some(443); - }); + secure_url.set_scheme("https").unwrap(); + // .set_port(Some(443)) would set the port to None, + // and should only be done when it was already None. secure_url } else { url.clone() |