Fix for link prefetching. Possible fix for weird wikipedia

Mike Perry · Mike Perry · commit d2dec0c104f3 · 2010-07-18T22:40:10.000Z
bug.



svn:r196
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -29,6 +29,10 @@ const HTTPS = {
   httpsRewrite: null,
   
   forceChannel: function(channel) {
+    if (channel.loadFlags & CI.nsIRequest.LOAD_BACKGROUND) {
+      HTTPS.log(INFO, "Background request.. Forcing channel replacement.");
+      return HTTPS.replaceChannel(channel);
+    }
     return this.forceURI(channel.URI, function() { return HTTPS.replaceChannel(channel); });
   },
   
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -252,12 +252,13 @@ HTTPSEverywhere.prototype = {
   // to "should this load?", but also allow us to change the thing.
 
   shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aInternalCall) {
+    if (aContentType == 11)
+      this.log(DBUG, "shouldLoad: "+aContentLocation.spec);
     var unwrappedLocation = IOUtil.unwrapURL(aContentLocation);
     var scheme = unwrappedLocation.scheme;
     var isHTTP = /^https?$/.test(scheme);   // s? -> either http or https
-    //this.log(WARN, "should load " + unwrappedLocation.spec);
     if (isHTTP)
-      HTTPS.forceURI(unwrappedLocation, null, aContext);
+      HTTPS.forceURI(aContentLocation, null, aContext);
     return true;
   },
 
