mozilla-central: changeset 43122:54b1ef73016757af0ac0fa2970867a8d9a5f0c7b

author	Robert Strong <robert.bugzilla@gmail.com>
	Sat, 05 Jun 2010 00:39:30 -0700
changeset 43122	54b1ef73016757af0ac0fa2970867a8d9a5f0c7b
parent 43121	63b89b3114614929b80a358163a2d1ae9feea91b
child 43123	b219912edfec87b80b97b44b6831868c7b1dcf31
push id	13626
push user	rstrong@mozilla.com
push date	Sat, 05 Jun 2010 07:39:52 +0000
treeherder	mozilla-central@54b1ef730167 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dveditz
bugs	569648
milestone	1.9.3a5pre
first release with	nightly linux32 b219912edfec / 3.7a5pre / 20100605030051 / files nightly linux64 b219912edfec / 3.7a5pre / 20100605030754 / files nightly mac b219912edfec / 3.7a5pre / 20100605030732 / files nightly win32 b219912edfec / 3.7a5pre / 20100605040240 / files nightly win64 fdb1e4bc853d / 3.7a5pre / 20100605160506 / files
last release without	nightly linux32 6dbc5341b490 / 3.7a5pre / 20100604030024 / files nightly linux64 6dbc5341b490 / 3.7a5pre / 20100604030722 / files nightly mac 6dbc5341b490 / 3.7a5pre / 20100604030754 / files nightly win32 6dbc5341b490 / 3.7a5pre / 20100604040314 / files nightly win64 402192edce61 / 3.7a5pre / 20100604175654 / files

--- a/toolkit/mozapps/shared/CertUtils.jsm
+++ b/toolkit/mozapps/shared/CertUtils.jsm
@@ -81,17 +81,19 @@ function isBuiltinToken(tokenName) {
 function BadCertHandler() {
 }
 BadCertHandler.prototype = {
 
   // nsIChannelEventSink
   onChannelRedirect: function(oldChannel, newChannel, flags) {
     // make sure the certificate of the old channel checks out before we follow
     // a redirect from it.  See bug 340198.
-    checkCert(oldChannel);
+    // Don't call checkCert for internal redirects. See bug 569648.
+    if (!(flags & Components.interfaces.nsIChannelEventSink.REDIRECT_INTERNAL))
+      checkCert(oldChannel);
   },
 
   // Suppress any certificate errors
   notifyCertProblem: function(socketInfo, status, targetSite) {
     return true;
   },
 
   // Suppress any ssl errors