fixes bug 257308 "Visual indicators of site security appear for the wrong site" r=biesi sr=bz

docshell/base/nsDocShell.cpp

@@ -4543,7 +4543,8 @@ nsDocShell::CreateContentViewer(const char *aContentType,
 
         loadGroup->AddRequest(request, nsnull);
         if (currentLoadGroup)
-            currentLoadGroup->RemoveRequest(request, nsnull, NS_OK);
+            currentLoadGroup->RemoveRequest(request, nsnull,
+                                            NS_BINDING_RETARGETED);
 
         // Update the notification callbacks, so that progress and
         // status information are sent to the right docshell...

uriloader/base/nsDocLoader.cpp

@@ -633,10 +633,11 @@ nsDocLoaderImpl::OnStopRequest(nsIRequest *aRequest,
           } 
           //
           // If the request failed (for any reason other than being
-          // redirected), the TRANSFERRING notification can still be fired
-          // if a HTTP connection was established to a server.
+          // redirected or retargeted), the TRANSFERRING notification can
+          // still be fired if a HTTP connection was established to a server.
           //
-          else if (aStatus != NS_BINDING_REDIRECTED) {
+          else if (aStatus != NS_BINDING_REDIRECTED &&
+                   aStatus != NS_BINDING_RETARGETED) {
             nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aRequest));
 
             if (httpChannel) {

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -1226,7 +1226,7 @@ void nsExternalAppHandler::RetargetLoadNotifications(nsIRequest *request)
   aChannel->GetLoadGroup(getter_AddRefs(oldLoadGroup));
 
   if(oldLoadGroup)
-     oldLoadGroup->RemoveRequest(request, nsnull, NS_OK);
+     oldLoadGroup->RemoveRequest(request, nsnull, NS_BINDING_RETARGETED);
       
   aChannel->SetLoadGroup(nsnull);
   aChannel->SetNotificationCallbacks(nsnull);