Bug 302115 "Try again" on XUL error page loads wrong thing after going back

r=bryner sr=bz


git-svn-id: svn://10.0.0.236/trunk@190544 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/docshell/base/nsDocShell.cpp

@@ -3002,6 +3002,17 @@ nsDocShell::LoadErrorPage(nsIURI *aURI, const PRUnichar *aURL,
         mURIResultedInDocument = PR_TRUE;
         OnNewURI(aURI, nsnull, mLoadType, PR_TRUE, PR_FALSE);
     }
+    // Be sure to have a correct mLSHE, it may have been cleared by
+    // EndPageLoad. See bug 302115.
+    if (mSessionHistory && !mLSHE) {
+        PRInt32 idx;
+        mSessionHistory->GetRequestedIndex(&idx);
+        nsCOMPtr<nsIHistoryEntry> entry;
+        mSessionHistory->GetEntryAtIndex(idx, PR_FALSE,
+                                         getter_AddRefs(entry));
+        mLSHE = do_QueryInterface(entry);
+
+    }
 
     nsCAutoString url;
     nsCAutoString charset;