Bug 585214 - Favicon fails to load on some sites. r=jst
authorHonza Bambas <honzab.moz@firemni.cz>
Sat, 14 Aug 2010 20:45:46 -0400
changeset 50610 40f2bdf80c555e67058c7bb1c0d559f5afb41f4a
parent 50609 7b475a00cd7cdf2d90c68affff00d71d8328176b
child 50611 2697c4534d64e8c5f545fc917852dbf49a12723f
push idunknown
push userunknown
push dateunknown
reviewersjst
bugs585214
milestone2.0b4pre
Bug 585214 - Favicon fails to load on some sites. r=jst
toolkit/mozapps/shared/CertUtils.jsm
--- a/toolkit/mozapps/shared/CertUtils.jsm
+++ b/toolkit/mozapps/shared/CertUtils.jsm
@@ -139,27 +139,29 @@ function isBuiltinToken(tokenName) {
  */
 function BadCertHandler(aAllowNonBuiltInCerts) {
   this.allowNonBuiltInCerts = aAllowNonBuiltInCerts;
 }
 BadCertHandler.prototype = {
 
   // nsIChannelEventSink
   asyncOnChannelRedirect: function(oldChannel, newChannel, flags, callback) {
-    if (this.allowNonBuiltInCerts)
+    if (this.allowNonBuiltInCerts) {
+      callback.onRedirectVerifyCallback(Components.results.NS_OK);
       return;
+    }
 
     // make sure the certificate of the old channel checks out before we follow
     // a redirect from it.  See bug 340198.
     // Don't call checkCert for internal redirects. See bug 569648.
     if (!(flags & Ci.nsIChannelEventSink.REDIRECT_INTERNAL))
       checkCert(oldChannel);
     
     callback.onRedirectVerifyCallback(Components.results.NS_OK);
-    },
+  },
 
   // Suppress any certificate errors
   notifyCertProblem: function(socketInfo, status, targetSite) {
     return true;
   },
 
   // Suppress any ssl errors
   notifySSLError: function(socketInfo, error, targetSite) {