Move redirect loop detection to prior block

semenko · diracdeltas · commit 907b8c098425 · 2013-12-26T10:31:21.000-08:00
No sense in testing the redirect counter right after we set it.

Signed-off-by: Nick Semenkovich &lt;semenko@alum.mit.edu&gt;
diff --git a/chromium/background.js b/chromium/background.js
@@ -116,19 +116,19 @@ function onBeforeRequest(details) {
     redirectCounter[details.requestId] += 1;
     log(DBUG, "Got redirect id "+details.requestId+
         ": "+redirectCounter[details.requestId]);
+
+    if (redirectCounter[details.requestId] > 9) {
+        log(NOTE, "Redirect counter hit for "+canonical_url);
+        urlBlacklist[canonical_url] = true;
+        var hostname = tmpuri.hostname();
+        domainBlacklist[hostname] = true;
+        log(WARN, "Domain blacklisted " + hostname);
+        return;
+    }
   } else {
     redirectCounter[details.requestId] = 0;
   }
 
-  if (redirectCounter[details.requestId] > 9) {
-    log(NOTE, "Redirect counter hit for "+canonical_url);
-    urlBlacklist[canonical_url] = true;
-    var hostname = tmpuri.hostname();
-    domainBlacklist[hostname] = true;
-    log(WARN, "Domain blacklisted " + hostname);
-    return;
-  }
-
   var newuristr = null;
 
   var rs = all_rules.potentiallyApplicableRulesets(a.hostname);
