From 15ff035be1e71573043b4e7bf6b33044c58702a3 Mon Sep 17 00:00:00 2001
From: "alqahira%ardisson.org"
 <alqahira%ardisson.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 26 Jul 2010 04:29:39 +0000
Subject: [PATCH] Bug 536466. Patch by Honza Bambas <honzab.moz@firemni.cz>,
 r=bz, a1.9.0.next=dveditz

git-svn-id: svn://10.0.0.236/trunk@260889 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 2b13aea4d5f..8c354302561 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -5081,6 +5081,12 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
             return; // nothing to tell anybody about
         AddToGlobalHistory(oldURI, PR_TRUE, aOldChannel);
     }
+
+    if (!(aRedirectFlags & nsIChannelEventSink::REDIRECT_INTERNAL) && 
+        mLoadType & (LOAD_CMD_RELOAD | LOAD_CMD_HISTORY)) {
+        mLoadType = LOAD_NORMAL_REPLACE;
+        SetHistoryEntry(&mLSHE, nsnull);
+    }
 }
 
 NS_IMETHODIMP