From ddad34acad5b7194fcece680aa055996a8de06eb Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Sat, 5 Jun 2010 00:39:30 -0700
Subject: [PATCH] Bug 569648 - First async XHR without other network activity
 has null securityInfo for the channel when using auto-detect proxy. r=dveditz

---
 toolkit/mozapps/shared/CertUtils.jsm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/mozapps/shared/CertUtils.jsm
index 9f789526d5b..1ec22adf347 100644
--- a/toolkit/mozapps/shared/CertUtils.jsm
+++ b/toolkit/mozapps/shared/CertUtils.jsm
@@ -86,7 +86,9 @@ BadCertHandler.prototype = {
   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