[or-cvs] r13615: Woops, broke the content policy. (torbutton/trunk/src/components)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-02-20 04:17:33 -0500 (Wed, 20 Feb 2008)
New Revision: 13615

Modified:
   torbutton/trunk/src/components/cssblocker.js
Log:

Woops, broke the content policy.



Modified: torbutton/trunk/src/components/cssblocker.js
===================================================================
--- torbutton/trunk/src/components/cssblocker.js	2008-02-20 08:32:51 UTC (rev 13614)
+++ torbutton/trunk/src/components/cssblocker.js	2008-02-20 09:17:33 UTC (rev 13615)
@@ -114,7 +114,7 @@
 
 ContentPolicy.prototype = {
     isLocalScheme: function(scheme) {
-        return (scheme in localSchemes) || loc == "about:blank";
+        return (scheme in localSchemes);
     },
 
 	// nsIContentPolicy interface implementation
@@ -151,13 +151,14 @@
         if(!origScheme) {
             // this gets hit for chrome://pippki for ssl confirm dialog..
             // Need to kill the warning for that case..
-            var source = (new RegExp(scheme+":\/\/([^\/]+)\/")).exec(cleanContentLoc).toLowerCase();
-            if(source[1] != "pippki") {
+            var source = (new RegExp(scheme+":\/\/([^\/]+)\/")).exec(cleanContentLoc);
+            // XXX: need to tolowercase this.. or maybe just get from nsURI
+            if(!source || source[1] != "pippki") {
                 this.logger.eclog(5, "NO ORIGIN! Chrome: "+cleanContentLoc);
             }
         }
         if(scheme == "chrome") {
-            var source = (new RegExp(scheme+":\/\/([^\/]+)\/")).exec(cleanContentLoc).toLowerCase();
+            var source = (new RegExp(scheme+":\/\/([^\/]+)\/")).exec(cleanContentLoc);
             if(!source) {
                 this.logger.eclog(4, "No Source! Chrome: "+cleanContentLoc+" from: "+cleanOriginLoc);
             } else if(!origScheme || origScheme != "chrome"