Bug 775009 - Part 2: Fix. r=bz

This commit is contained in:
Justin Lebar
2012-08-25 18:23:53 -04:00
parent 43a8065a32
commit 09d4197337

View File

@@ -8687,6 +8687,17 @@ nsDocShell::InternalLoad(nsIURI * aURI,
sameExceptHashes && !newHash.IsEmpty());
if (doShortCircuitedLoad) {
// Cancel any outstanding loads if this is a history load.
//
// We can't cancel the oustanding load unconditionally, because if a page does
// - load a.html
// - start loading b.html
// - load a.html#h
// we break the web if we cancel the load of b.html.
if (aSHEntry) {
Stop(nsIWebNavigation::STOP_NETWORK);
}
// Save the current URI; we need it if we fire a hashchange later.
nsCOMPtr<nsIURI> oldURI = mCurrentURI;