From 00c529fcaa322e9bc33a1ce2be386bd546bb15d7 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Mon, 30 Oct 2000 23:56:10 +0000 Subject: [PATCH] Bug #56938 --> Implement stand alone method for setting up a refresh URI in the docshell given just a channel. sr=rpotts r=sspitzer git-svn-id: svn://10.0.0.236/branches/Netscape_20000922_BRANCH@82073 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 23e8946f99a..b7447689a7e 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3777,6 +3777,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) { @@ -3859,7 +3870,6 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, PRUint32 aLoadType) } } - mInitialPageLoad = PR_FALSE; return NS_OK; }