Bug 536466, r=bz

2010-05-11 18:00:53 +02:00
parent f7a3337dad
commit 6738e2252c
1 changed files with 6 additions and 0 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5701,6 +5701,12 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
        aNewChannel->GetURI(getter_AddRefs(newURI));
        appCacheChannel->SetChooseApplicationCache(ShouldCheckAppCache(newURI));
    }
+
+    if (!(aRedirectFlags & nsIChannelEventSink::REDIRECT_INTERNAL) && 
+        mLoadType & (LOAD_CMD_RELOAD | LOAD_CMD_HISTORY)) {
+        mLoadType = LOAD_NORMAL_REPLACE;
+        SetHistoryEntry(&mLSHE, nsnull);
+    }
 }

 NS_IMETHODIMP