Support a new "mixedcontent" platform to start responding to havoc on Chrome

pde · pde · commit 0a56370cc952 · 2012-09-25T17:44:11.000-07:00
We will need this for https://trac.torproject.org/projects/tor/ticket/6975
diff --git a/chromium/manifest.json b/chromium/manifest.json
@@ -33,6 +33,6 @@
         "cookies", 
         "<all_urls>"
     ], 
-    "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml",
-    "version": "2012.9.21"
-}
+    "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", 
+    "version": "2012.9.25"
+}
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -16,7 +16,7 @@ function CookieRule(host, cookiename) {
   this.name_c = new RegExp(cookiename);
 }
 
-localPlatformRegexp = new RegExp("firefox");
+localPlatformRegexp = new RegExp("(firefox|mixedcontent)");
 ruleset_counter = 0;
 function RuleSet(name, xmlName, match_rule, default_off, platform) {
   this.id="httpseR" + ruleset_counter;
diff --git a/utils/relaxng.xml b/utils/relaxng.xml
@@ -12,7 +12,7 @@
   <optional>
     <attribute name="platform">
       <data type="string">
-        <param name="pattern">(firefox|chromium|cacert|ipsca)( (firefox|chromium|cacert|ipsca))*</param>
+        <param name="pattern">(firefox|chromium|cacert|ipsca|mixedcontent)( (firefox|chromium|cacert|ipsca|mixedcontent))*</param>
       </data>
     </attribute>
   </optional>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function CookieRule(host, cookiename) {`
`16`	`16`	`this.name_c = new RegExp(cookiename);`
`17`	`17`	`}`
`18`	`18`
`19`		`-localPlatformRegexp = new RegExp("firefox");`
	`19`	`+localPlatformRegexp = new RegExp("(firefox\|mixedcontent)");`
`20`	`20`	`ruleset_counter = 0;`
`21`	`21`	`function RuleSet(name, xmlName, match_rule, default_off, platform) {`
`22`	`22`	`this.id="httpseR" + ruleset_counter;`