From c1ebc569e803ca350ac3b1d27fa2b5fc8a520b52 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 31 Mar 2007 23:09:08 +0000
Subject: [PATCH] Closing tab generates SSL warning b=354927 r=CTho sr=jag

git-svn-id: svn://10.0.0.236/trunk@223945 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/tabbrowser.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mozilla/suite/browser/tabbrowser.xml b/mozilla/suite/browser/tabbrowser.xml
index 23a90cdd63d..7f544be266a 100644
--- a/mozilla/suite/browser/tabbrowser.xml
+++ b/mozilla/suite/browser/tabbrowser.xml
@@ -1115,7 +1115,7 @@
               t.setAttribute("afterselected", true);
 
             // navigate back to the proper page from the light page
-            b.webNavigation.goBack();
+            b.webNavigation.gotoIndex(0);
 
             // reattach the old history
             b.webNavigation.sessionHistory = hist;
@@ -1254,7 +1254,10 @@
             var entry = oldSH.getEntryAtIndex(oldSH.index, false)
             newSH.addEntry(entry, true);
 
-            oldBrowser.loadURI("about:blank");
+            // LOAD_FLAGS_FROM_EXTERNAL forces the eviction of the current page
+            oldBrowser.loadURIWithFlags("about:blank", Components.interfaces.nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL);
+            // But we don't actually want the blank page to load (bug 354927)
+            oldBrowser.stop();
 
             // remove overflow from the undo stack
             if (this.savedBrowsers.length > maxUndoDepth) {