Better logging, fix typos

diracdeltas · diracdeltas · commit 0c159ddbecf3 · 2013-08-14T13:13:30.000-07:00
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -37,7 +37,7 @@ const HTTPS = {
     if (!uri) this.log(WARN, "OH NO BAD ARGH\nARGH");
 
     var c2 = channel.QueryInterface(CI.nsIHttpChannel);
-    this.log(DBUG,"Redirection limit is " + c2.redirectionLimit);
+    this.log(DBUG, channel.URI.spec+": Redirection limit is " + c2.redirectionLimit);
     // XXX This used to be (c2.redirectionLimit == 1), but that's very
     // inefficient in a case (eg amazon) where this may happen A LOT.
     // Rather than number like 10, we should use the starting value
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -472,11 +472,13 @@ const HTTPSRules = {
       blob.newuri = rs[i].transformURI(uri);
       if (blob.newuri) {
         // we rewrote the uri
-        if (alist)
+	this.log(DBUG, "Rewrote "+input_uri.spec);
+        if (alist) {
           if (uri.spec in https_everywhere_blacklist) 
-            alist.breaking_rule(rs[i])
+            alist.breaking_rule(rs[i]);
           else 
             alist.active_rule(rs[i]);
+	}
         if (userpass_present) blob.newuri.userPass = input_uri.userPass;
         blob.applied_ruleset = rs[i];
         return blob;
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -430,7 +430,7 @@ HTTPSEverywhere.prototype = {
       if (!(channel instanceof CI.nsIHttpChannel)) return;
       
       this.log(DBUG,"Got http-on-modify-request: "+channel.URI.spec);
-      var lst = this.getApplicableListForChannel(channel);
+      var lst = this.getApplicableListForChannel(channel); // null if no window is associated (ex: xhr)
       if (channel.URI.spec in https_everywhere_blacklist) {
         this.log(DBUG, "Avoiding blacklisted " + channel.URI.spec);
         if (lst) lst.breaking_rule(https_everywhere_blacklist[channel.URI.spec])
@@ -541,7 +541,7 @@ HTTPSEverywhere.prototype = {
   // nsIChannelEventSink implementation
   onChannelRedirect: function(oldChannel, newChannel, flags) {  
     const uri = newChannel.URI;
-    this.log(DBUG,"Got onChannelRedirect.");
+    this.log(DBUG,"Got onChannelRedirect to "+uri.spec);
     if (!(newChannel instanceof CI.nsIHttpChannel)) {
       this.log(DBUG, newChannel + " is not an instance of nsIHttpChannel");
       return;
