Remove double call of resume and reorg loadRulesets

jsha · jsha · commit 54c26f7efebf · 2015-08-19T15:53:14.000-07:00
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -59,6 +59,7 @@ const HTTPS = {
       this.log(WARN, 'Failed to resume ' + channel.URI.spec + ': ' + e);
       return;
     }
+    this.log(WARN, 'Succeeded to resume ' + channel.URI.spec + ' ');
     var isSTS = securityService.isSecureURI(
         CI.nsISiteSecurityService.HEADER_HSTS, channel.URI, 0);
     if (blob === null) {
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -522,6 +522,7 @@ const HTTPSRules = {
           if (userpass_present) blob.newuri.userPass = input_uri.userPass;
           blob.applied_ruleset = rs[i];
           callback(blob);
+          return
         }
         if (uri.scheme == "https" && alist) {
           // we didn't rewrite but the rule applies to this domain and the
@@ -531,6 +532,7 @@ const HTTPSRules = {
         } 
       }
       callback(null);
+      return;
     });
   },
 
@@ -605,26 +607,25 @@ const HTTPSRules = {
   rulesetsByTargets: function(targets, callback) {
     var output = [];
     var foundIds = [];
+    var neededIds = [];
     var that = this;
     targets.forEach(function(target) {
-      var rulesetIds = that.targets[target];
-
-      if (rulesetIds) {
-        for (var i = 0; i < rulesetIds.length; i++) {
-          var id = rulesetIds[i];
-          if (!that.rulesetsByID[id]) {
-            that.loadRulesetById(id);
-          }
-          if (that.rulesetsByID[id]) {
-            foundIds.push(id);
-            output.push(that.rulesetsByID[id]);
-          }
+      var rulesetIds = that.targets[target] || [];
+      rulesetIds.forEach(function(id) {
+        foundIds.push(id);
+        if (!that.rulesetsByID[id]) {
+          neededIds.push(id);
+        } else {
+          output.push(that.rulesetsByID[id]);
         }
-      } else {
-        that.log(DBUG, "For target " + target + ", found no ids in DB");
-      }
+      });
+    });
+
+    neededIds.forEach(function(id) {
+      that.loadRulesetById(id);
+      output.push(that.rulesetsByID[id]);
     });
-    that.log(DBUG, "For targets " + targets.join(' ') + ", found ids " + foundIds.join(','));
+    that.log(WARN, "For targets " + targets.join(' ') + ", found ids " + foundIds.join(','));
     callback(output);
   },
 
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -655,6 +655,7 @@ HTTPSEverywhere.prototype = {
     // XXX: This causes NS_ERROR_UNAVAILABLE when replaceChannel tries to
     // suspend the channel.
     //HTTPS.replaceChannel(alist, newChannel, this.httpNowhereEnabled);
+    //
   },
 
   juggleApplicableListsDuringRedirection: function(oldChannel, newChannel) {

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ const HTTPS = {`
`59`	`59`	`this.log(WARN, 'Failed to resume ' + channel.URI.spec + ': ' + e);`
`60`	`60`	`return;`
`61`	`61`	`}`
	`62`	`+ this.log(WARN, 'Succeeded to resume ' + channel.URI.spec + ' ');`
`62`	`63`	`var isSTS = securityService.isSecureURI(`
`63`	`64`	`CI.nsISiteSecurityService.HEADER_HSTS, channel.URI, 0);`
`64`	`65`	`if (blob === null) {`