Bug 775009 - Part 2: Fix. r=bz
This commit is contained in:
@@ -8687,6 +8687,17 @@ nsDocShell::InternalLoad(nsIURI * aURI,
|
|||||||
sameExceptHashes && !newHash.IsEmpty());
|
sameExceptHashes && !newHash.IsEmpty());
|
||||||
|
|
||||||
if (doShortCircuitedLoad) {
|
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.
|
// Save the current URI; we need it if we fire a hashchange later.
|
||||||
nsCOMPtr<nsIURI> oldURI = mCurrentURI;
|
nsCOMPtr<nsIURI> oldURI = mCurrentURI;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user