From 9123fe0cefdba5f92b494d046e07a7810730e0e3 Mon Sep 17 00:00:00 2001
From: Rohit Burra <iamrohit7@gmail.com>
Date: Sun, 25 Dec 2016 09:02:44 +0530
Subject: [PATCH 1/3] Adds ServoUrl::is_secure_scheme helper

---
 components/url/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/url/lib.rs b/components/url/lib.rs
index 415b2dd4ea6..43498444a54 100644
--- a/components/url/lib.rs
+++ b/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()
     }

From 49abf57debaf8548b263834feb0b7e7511f0a1d5 Mon Sep 17 00:00:00 2001
From: Rohit Burra <iamrohit7@gmail.com>
Date: Sun, 25 Dec 2016 09:13:21 +0530
Subject: [PATCH 2/3] Refactor to use ServoUrl::is_secure_scheme

---
 components/net/cookie_storage.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/net/cookie_storage.rs b/components/net/cookie_storage.rs
index cf2779daa04..8d39334263c 100644
--- a/components/net/cookie_storage.rs
+++ b/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;
         }
 

From 3fce260f6e060468fce1b6e8e439c35ab714ec29 Mon Sep 17 00:00:00 2001
From: Rohit Burra <iamrohit7@gmail.com>
Date: Sun, 25 Dec 2016 09:14:06 +0530
Subject: [PATCH 3/3] Check wss scheme in Cookie::appropriate_for_url

---
 components/net/cookie.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/net/cookie.rs b/components/net/cookie.rs
index b47246440ca..42a49a4ac0a 100644
--- a/components/net/cookie.rs
+++ b/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 {