diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index e90b8a72711..5da465f772f 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3772,6 +3772,17 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, PRUint32 aLoadType) } SetCurrentURI(aURI); + // if there's a refresh header in the channel, this method + // will set it up for us. + SetupRefreshURI(aChannel); + + mInitialPageLoad = PR_FALSE; + return NS_OK; +} + +NS_IMETHODIMP +nsDocShell::SetupRefreshURI(nsIChannel * aChannel) +{ nsCOMPtr httpChannel(do_QueryInterface(aChannel)); if(httpChannel) { @@ -3854,7 +3865,6 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, PRUint32 aLoadType) } } - mInitialPageLoad = PR_FALSE; return NS_OK; }