Merge pull request EFForg#209 from semenko/fix-cookie-bug

diracdeltas · diracdeltas · commit ff2bc1db2d01 · 2014-04-05T21:44:26.000-07:00
Fix cookie bug
diff --git a/chromium/background.js b/chromium/background.js
@@ -312,15 +312,15 @@ function onCookieChanged(changeInfo) {
       }
 
       // The cookie API is magical -- we must recreate the URL from the domain and path.
-      if (cookie.domain[0] == ".") {
-          cookie.url = "https://www" + cookie.domain + cookie.path;
+      if (changeInfo.cookie.domain[0] == ".") {
+          cookie.url = "https://www" + changeInfo.cookie.domain + cookie.path;
       } else {
-          cookie.url = "https://" + cookie.domain + cookie.path;
+          cookie.url = "https://" + changeInfo.cookie.domain + cookie.path;
       }
       // We get repeated events for some cookies because sites change their
       // value repeatedly and remove the "secure" flag.
       log(DBUG,
-       "Securing cookie "+cookie.name+" for "+cookie.domain+", was secure="+changeInfo.cookie.secure);
+       "Securing cookie " + cookie.name + " for " + changeInfo.cookie.domain + ", was secure=" + changeInfo.cookie.secure);
       chrome.cookies.set(cookie);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -312,15 +312,15 @@ function onCookieChanged(changeInfo) {`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`// The cookie API is magical -- we must recreate the URL from the domain and path.`
`315`		`- if (cookie.domain[0] == ".") {`
`316`		`- cookie.url = "https://www" + cookie.domain + cookie.path;`
	`315`	`+ if (changeInfo.cookie.domain[0] == ".") {`
	`316`	`+ cookie.url = "https://www" + changeInfo.cookie.domain + cookie.path;`
`317`	`317`	`} else {`
`318`		`- cookie.url = "https://" + cookie.domain + cookie.path;`
	`318`	`+ cookie.url = "https://" + changeInfo.cookie.domain + cookie.path;`
`319`	`319`	`}`
`320`	`320`	`// We get repeated events for some cookies because sites change their`
`321`	`321`	`// value repeatedly and remove the "secure" flag.`
`322`	`322`	`log(DBUG,`
`323`		`- "Securing cookie "+cookie.name+" for "+cookie.domain+", was secure="+changeInfo.cookie.secure);`
	`323`	`+ "Securing cookie " + cookie.name + " for " + changeInfo.cookie.domain + ", was secure=" + changeInfo.cookie.secure);`
`324`	`324`	`chrome.cookies.set(cookie);`
`325`	`325`	`}`
`326`	`326`	`}`