Check for wss schemes in Cookie::appropriate_for_url

components/net/cookie.rs

@@ -160,7 +160,7 @@ impl Cookie {
             }
         }
 
-        if self.cookie.secure && url.scheme() != "https" {
+        if self.cookie.secure && !url.is_secure_scheme() {
             return false;
         }
         if self.cookie.httponly && source == CookieSource::NonHTTP {

components/net/cookie_storage.rs

@@ -38,7 +38,7 @@ impl CookieStorage {
         let cookies = self.cookies_map.entry(domain).or_insert(vec![]);
 
         // https://www.ietf.org/id/draft-ietf-httpbis-cookie-alone-01.txt Step 2
-        if !cookie.cookie.secure && url.scheme() != "https" && url.scheme() != "wss" {
+        if !cookie.cookie.secure && !url.is_secure_scheme() {
             let new_domain = cookie.cookie.domain.as_ref().unwrap();
             let new_path = cookie.cookie.path.as_ref().unwrap();
 
@@ -85,7 +85,7 @@ impl CookieStorage {
     // http://tools.ietf.org/html/rfc6265#section-5.3
     pub fn push(&mut self, mut cookie: Cookie, url: &ServoUrl, source: CookieSource) {
         // https://www.ietf.org/id/draft-ietf-httpbis-cookie-alone-01.txt Step 1
-        if cookie.cookie.secure && url.scheme() != "https" && url.scheme() != "wss" {
+        if cookie.cookie.secure && !url.is_secure_scheme() {
             return;
         }
 

components/url/lib.rs

@@ -79,6 +79,11 @@ impl ServoUrl {
         self.0.scheme()
     }
 
+    pub fn is_secure_scheme(&self) -> bool {
+        let scheme = self.scheme();
+        scheme == "https" || scheme == "wss"
+    }
+
     pub fn as_str(&self) -> &str {
         self.0.as_str()
     }