Fix Conflicts after merging with v5.2.4

Author: luciancor

install-dev-dependencies.sh

@@ -17,13 +17,8 @@ if type apt-get >/dev/null ; then
     BROWSERS="iceweasel chromium"
     CHROMEDRIVER="chromedriver"
   fi
-<<<<<<< HEAD
-  sudo apt-get install -y libxml2-dev libxml2-utils libxslt1-dev python-dev \
-    $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \
-=======
   $SUDO_SHIM apt-get install libxml2-dev libxml2-utils libxslt1-dev \
     python-dev $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \
->>>>>>> effRelease
     libssl-dev git $CHROMEDRIVER
 elif type brew >/dev/null ; then
   brew list python &>/dev/null || brew install python

src/chrome/content/code/HTTPSRules.js

@@ -121,32 +121,32 @@ RuleSet.prototype = {
   log: function(level, msg) {
     https_everywhereLog(level, msg);
   },
- 
+
   wouldMatch: function(hypothetical_uri, alist) {
     // return true if this ruleset would match the uri, assuming it were http
     // used for judging moot / inactive rulesets
     // alist is optional
- 
+
     // if the ruleset is already somewhere in this applicable list, we don't
     // care about hypothetical wouldMatch questions
     if (alist && (this.name in alist.all)) return false;
- 
+
     this.log(DBUG,"Would " +this.name + " match " +hypothetical_uri.spec +
              "?  serial " + (alist && alist.serial));
-     
+
     var uri = hypothetical_uri.clone();
     if (uri.scheme == "https") uri.scheme = "http";
     var urispec = uri.spec;
 
     this.ensureCompiled();
 
-    if (this.ruleset_match_c && !this.ruleset_match_c.test(urispec)) 
+    if (this.ruleset_match_c && !this.ruleset_match_c.test(urispec))
       return false;
 
-    for (var i = 0; i < this.exclusions.length; ++i) 
+    for (var i = 0; i < this.exclusions.length; ++i)
       if (this.exclusions[i].pattern_c.test(urispec)) return false;
 
-    for (var i = 0; i < this.rules.length; ++i) 
+    for (var i = 0; i < this.rules.length; ++i)
       if (this.rules[i].from_c.test(urispec)) return true;
     return false;
   },
@@ -156,7 +156,7 @@ RuleSet.prototype = {
     // inactive, return 0; otherwise, return a fresh uri instance
     // for the target
     var newurl = this.apply(uri.spec);
-    if (null == newurl) 
+    if (null == newurl)
       return null;
     var newuri = Components.classes["@mozilla.org/network/standard-url;1"].
                  createInstance(CI.nsIStandardURL);
@@ -269,10 +269,7 @@ const RuleWriter = {
 
     return data.value;
   },
-<<<<<<< HEAD
-=======
 
->>>>>>> effRelease
   readFromFile: function(file) {
     if (!file.exists())
       return null;
@@ -499,7 +496,7 @@ const HTTPSRules = {
     // the new uri if there was a rewrite.  Now it returns a JS object with a
     // newuri attribute and an applied_ruleset attribute (or null if there's
     // no rewrite).
-    var i = 0; 
+    var i = 0;
     userpass_present = false; // Global so that sanitiseURI can tweak it.
                               // Why does JS have no tuples, again?
     var blob = {}; blob.newuri = null;
@@ -523,13 +520,13 @@ const HTTPSRules = {
         if (alist && rs[i].wouldMatch(uri, alist))
           alist.inactive_rule(rs[i]);
         continue;
-      } 
+      }
       blob.newuri = rs[i].transformURI(uri);
       if (blob.newuri) {
         if (alist) {
-          if (uri.spec in https_everywhere_blacklist) 
+          if (uri.spec in https_everywhere_blacklist)
             alist.breaking_rule(rs[i]);
-          else 
+          else
             alist.active_rule(rs[i]);
   }
         if (userpass_present) blob.newuri.userPass = input_uri.userPass;
@@ -541,7 +538,7 @@ const HTTPSRules = {
         // requests are going over https
         if (rs[i].wouldMatch(uri, alist)) alist.moot_rule(rs[i]);
         continue;
-      } 
+      }
     }
     return null;
   },
@@ -557,7 +554,7 @@ const HTTPSRules = {
         uri = input_uri.clone();
         userpass_present = true; // tweaking a global in our caller :(
         uri.userPass = null;
-      } 
+      }
     } catch(e) {}
 
     // example.com.  is equivalent to example.com
@@ -567,7 +564,7 @@ const HTTPSRules = {
         try {
           var h = uri.host;
           if (h.charAt(h.length - 1) == ".") {
-            while (h.charAt(h.length - 1) == ".") 
+            while (h.charAt(h.length - 1) == ".")
               h = h.slice(0,-1);
             uri = uri.clone();
             uri.host = h;
@@ -760,7 +757,7 @@ const HTTPSRules = {
       nonce_path = nonce_path + nonce_path;
       var test_uri = "http://" + domain + nonce_path;
     } catch (e) {
-      this.log(WARN, "explosion in safeToSecureCookie for " + domain + "\n" 
+      this.log(WARN, "explosion in safeToSecureCookie for " + domain + "\n"
                       + "(" + e + ")");
       return false;
     }

src/components/https-everywhere.js

@@ -92,7 +92,7 @@ const WHERE_UNTRUSTED = 1;
 const WHERE_TRUSTED = 2;
 const ANYWHERE = 3;
 
-const N_COHORTS = 1000; 
+const N_COHORTS = 1000;
 
 const DUMMY_OBJ = {};
 DUMMY_OBJ.wrappedJSObject = DUMMY_OBJ;
@@ -146,7 +146,7 @@ function HTTPSEverywhere() {
   // we rewrite.
   this.obsService = CC["@mozilla.org/observer-service;1"]
                     .getService(Components.interfaces.nsIObserverService);
-                    
+
   if (this.prefs.getBoolPref("globalEnabled")) {
     this.obsService.addObserver(this, "profile-before-change", false);
     this.obsService.addObserver(this, "profile-after-change", false);
@@ -180,10 +180,10 @@ In recent versions of Firefox and HTTPS Everywhere, the call stack for performin
 1. HTTPSEverywhere.shouldIgnoreURI() checks for very quick reasons to ignore a
 request, such as redirection loops, non-HTTP[S] URIs, and OCSP
 
-    2. HTTPS.replaceChannel() 
+    2. HTTPS.replaceChannel()
+
+       3. HTTPSRules.rewrittenURI()
 
-       3. HTTPSRules.rewrittenURI() 
-            
            4. HTTPSRules.potentiallyApplicableRulesets uses <target host=""> elements to identify relevant rulesets
 
            foreach RuleSet:
@@ -468,11 +468,7 @@ HTTPSEverywhere.prototype = {
   loadOCSPList: function() {
     try {
       var loc = "chrome://https-everywhere/content/code/commonOCSP.json";
-<<<<<<< HEAD
-      var data = this.rw.readFromFile(loc);
-=======
       var data = this.rw.readFromUrl(loc);
->>>>>>> effRelease
       this.ocspList = JSON.parse(data);
     } catch(e) {
       this.log(WARN, "Failed to load OCSP list: " + e);
@@ -633,7 +629,7 @@ HTTPSEverywhere.prototype = {
     // This variable is used for gradually turning on features for testing and
     // scalability purposes.  It is a random integer [0,N_COHORTS) generated
     // once and stored thereafter.
-    // 
+    //
     // This is not currently used/called in the development branch
     var cohort;
     try {
@@ -701,18 +697,18 @@ HTTPSEverywhere.prototype = {
   },
 
   chrome_opener: function(uri, args) {
-    // we don't use window.open, because we need to work around TorButton's 
+    // we don't use window.open, because we need to work around TorButton's
     // state control
     args = args || 'chrome,centerscreen';
     return CC['@mozilla.org/appshell/window-mediator;1']
-      .getService(CI.nsIWindowMediator) 
+      .getService(CI.nsIWindowMediator)
       .getMostRecentWindow('navigator:browser')
       .open(uri,'', args );
   },
 
   tab_opener: function(uri) {
     var gb = CC['@mozilla.org/appshell/window-mediator;1']
-      .getService(CI.nsIWindowMediator) 
+      .getService(CI.nsIWindowMediator)
       .getMostRecentWindow('navigator:browser')
       .gBrowser;
     var tab = gb.addTab(uri);
@@ -806,7 +802,7 @@ function https_everywhereLog(level, str) {
     prefs = HTTPSEverywhere.instance.get_prefs();
     econsole = Components.classes["@mozilla.org/consoleservice;1"]
                .getService(Components.interfaces.nsIConsoleService);
-  } 
+  }
   try {
     var threshold = prefs.getIntPref(LLVAR);
   } catch (e) {

src/install.rdf

@@ -13,11 +13,7 @@
         <em:multiprocessCompatible>true</em:multiprocessCompatible>
         <em:homepageURL>https://www.eff.org/https-everywhere</em:homepageURL>
         <em:iconURL>chrome://https-everywhere/skin/icon-active-48.png</em:iconURL>
-<<<<<<< HEAD
-        <em:unpack>false</em:unpack> <!-- Required for Firefox 4 -->
-=======
         <em:unpack>false</em:unpack>
->>>>>>> effRelease
         <em:updateURL>https://www.eff.org/files/https-everywhere-eff-update-2048.rdf</em:updateURL> <!-- 2015-08-14: New update URL to go with new id (https-everywhere-eff@ef.org) -->
         <em:updateKey>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MR8W/galdxnpGqBsYbqOzQb2eyW15YFjDDEMI0ZOzt8f504obNs920lDnpPD2/KqgsfjOgw2K7xWDJIj/18xUvWPk3LDkrnokNiRkA3KOx3W6fHycKL+zID7zy+xZYBuh2fLyQtWV1VGQ45iNRp9+Zo7rH86cdfgkdnWTlNSHyTLW9NbXvyv/E12bppPcEvgCTAQXgnDVJ0/sqmeiijn9tTFh03aM+R2V/21h8aTraAS24qiPCz6gkmYGC8yr6mglcnNoYbsLNYZ69zF1XHcXPduCPdPdfLlzVlKK1/U7hkA28eG3BIAMh6uJYBRJTpiGgaGdPd7YekUB8S6cy+CQIDAQAB</em:updateKey>
         <!-- Firefox -->