More formatting fixes

jsha · jsha · commit 8795a9cd865c · 2014-12-04T16:18:07.000-08:00
diff --git a/chromium/rules.js b/chromium/rules.js
@@ -249,11 +249,6 @@ RuleSets.prototype = {
     // Check to see if the Cookie object c meets any of our cookierule citeria
     // for being marked as secure.  knownHttps is true if the context for this
     // cookie being set is known to be https.
-    //log(DBUG, "Testing cookie:");
-    //log(DBUG, "  name: " + cookie.name);
-    //log(DBUG, "  host: " + cookie.host);
-    //log(DBUG, "  domain: " + cookie.domain);
-    //log(DBUG, "  rawhost: " + cookie.rawHost);
     var hostname = cookie.domain;
     // cookie domain scopes can start with .
     while (hostname.charAt(0) == ".")
@@ -272,10 +267,6 @@ RuleSets.prototype = {
           if (cr.host_c.test(cookie.domain) && cr.name_c.test(cookie.name)) {
             return ruleset;
           }
-          //log(WARN, "no match domain " + cr.host_c.test(cookie.domain) +
-          //          " name " + cr.name_c.test(cookie.name));
-          //log(WARN, "with " + cookie.domain + " " + cookie.name);
-          //log(WARN, "and " + cr.host + " " + cr.name);
         }
       }
     }
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -156,7 +156,7 @@ const HTTPS = {
 
   handleInsecureCookie: function(c) {
     if (HTTPSRules.shouldSecureCookie(null, c, false)) {
-      this.log(INFO, "Securing cookie from event: " + c.domain + " " + c.name);
+      this.log(INFO, "Securing cookie from event: " + c.host + " " + c.name);
       var cookieManager = Components.classes["@mozilla.org/cookiemanager;1"]
                             .getService(Components.interfaces.nsICookieManager2);
       //some braindead cookies apparently use umghzabilliontrabilions
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -493,7 +493,7 @@ const HTTPSRules = {
                               // Why does JS have no tuples, again?
     var blob = {}; blob.newuri = null;
     if (!alist) this.log(DBUG, "No applicable list rewriting " + input_uri.spec);
-    this.log(NOTE, "Processing " + input_uri.spec);
+    this.log(DBUG, "Processing " + input_uri.spec);
 
     var uri = this.sanitiseURI(input_uri);
 
@@ -709,7 +709,7 @@ const HTTPSRules = {
     // @c : an nsICookie2
     // @known_https : true if we know the page setting the cookie is https
 
-    this.log(DBUG,"  rawhost: " + c.rawHost + "\n  name: " + c.name + "\n  host" + c.host);
+    this.log(DBUG,"  rawhost: " + c.rawHost + " name: " + c.name + " host" + c.host);
     var i,j;
     var rs = this.potentiallyApplicableRulesets(c.host);
     for (i = 0; i < rs.length; ++i) {
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -1,5 +1,4 @@
-// LOG LEVELS ---
-
+// LOG LEVELS
 let VERB=1;
 let DBUG=2;
 let INFO=3;
@@ -18,7 +17,6 @@ let https_everywhere_blacklist = {};
 // domains for which there is at least one blacklisted URL
 let https_blacklist_domains = {};
 
-//
 const CI = Components.interfaces;
 const CC = Components.classes;
 const CU = Components.utils;
@@ -333,7 +331,9 @@ HTTPSEverywhere.prototype = {
         loadContext = channel.loadGroup.notificationCallbacks
           .getInterface(CI.nsILoadContext);
       } catch(e) {
-        this.log(NOTE, "no loadGroup notificationCallbacks for "
+        // Lots of requests have no notificationCallbacks, mostly background
+        // ones like OCSP checks or smart browsing fetches.
+        this.log(DBUG, "no loadGroup notificationCallbacks for "
                  + channel.URI.spec + ": " + e);
         return null;
       }
@@ -835,7 +835,7 @@ function https_everywhereLog(level, str) {
     threshold = WARN;
   }
   if (level >= threshold) {
-    var levelName = ["", "VERB", "DBUG", "INFO", "NOTE", "WARN"][+level];
+    var levelName = ["", "VERB", "DBUG", "INFO", "NOTE", "WARN"][level];
     var prefix = "HTTPS Everywhere " + levelName + ": ";
     // dump() prints to browser stdout. That's sometimes undesireable,
     // so only do it when a pref is set (running from test.sh enables

Original file line number	Diff line number	Diff line change
`@@ -249,11 +249,6 @@ RuleSets.prototype = {`
`249`	`249`	`// Check to see if the Cookie object c meets any of our cookierule citeria`
`250`	`250`	`// for being marked as secure. knownHttps is true if the context for this`
`251`	`251`	`// cookie being set is known to be https.`
`252`		`- //log(DBUG, "Testing cookie:");`
`253`		`- //log(DBUG, " name: " + cookie.name);`
`254`		`- //log(DBUG, " host: " + cookie.host);`
`255`		`- //log(DBUG, " domain: " + cookie.domain);`
`256`		`- //log(DBUG, " rawhost: " + cookie.rawHost);`
`257`	`252`	`var hostname = cookie.domain;`
`258`	`253`	`// cookie domain scopes can start with .`
`259`	`254`	`while (hostname.charAt(0) == ".")`
`@@ -272,10 +267,6 @@ RuleSets.prototype = {`
`272`	`267`	`if (cr.host_c.test(cookie.domain) && cr.name_c.test(cookie.name)) {`
`273`	`268`	`return ruleset;`
`274`	`269`	`}`
`275`		`- //log(WARN, "no match domain " + cr.host_c.test(cookie.domain) +`
`276`		`- // " name " + cr.name_c.test(cookie.name));`
`277`		`- //log(WARN, "with " + cookie.domain + " " + cookie.name);`
`278`		`- //log(WARN, "and " + cr.host + " " + cr.name);`
`279`	`270`	`}`
`280`	`271`	`}`
`281`	`272`	`}`