From 716e6e11a84f2485d1fe8dcbd42876140fa461ea Mon Sep 17 00:00:00 2001
From: "nisheeth%netscape.com" <nisheeth%netscape.com>
Date: Thu, 4 Nov 1999 22:09:46 +0000
Subject: [PATCH] r=norris,warren,radha. a=chofmann. Fix for bug 1646.
Javascript: URLS were not getting loaded properly because the webshell was
changing its notion of the current document (by setting mURL and mReferrer)
too eagerly. Now, it does so only after the nsDocLoader::LoadDocument() in
DoLoadURL() returns successfully.
---
docshell/base/nsWebShell.cpp | 20 ++++++++++----------
webshell/src/nsWebShell.cpp | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp
index 576f64242436..1c8852f9733e 100644
--- a/docshell/base/nsWebShell.cpp
+++ b/docshell/base/nsWebShell.cpp
@@ -1978,14 +1978,6 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
rv = aUri->GetSpec(getter_Copies(urlSpec));
if (NS_FAILED(rv)) return rv;
- /* mURL is being set the value again so that calls to DoLoadURL() from Viewer
- * will work right. This statement could go to Goto(), but that really is
- * Vidur's call
- */
- mURL = urlSpec;
-
- mReferrer = aReferrer;
-
// If it's a normal reload that uses the cache, look at the destination anchor
// and see if it's an element within the current document
// We don't have a reload loadtype yet in necko. So, check for just history
@@ -2092,8 +2084,7 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
/* WebShell was primarily passing the buck when it came to streamObserver.
* So, pass on the observer which is already a streamObserver to DocLoder.
*/
-
- return mDocLoader->LoadDocument(aUri, // URL string
+ rv = mDocLoader->LoadDocument(aUri, // URL string
aCommand, // Command
this, // Container
aPostDataStream, // Post Data
@@ -2101,6 +2092,15 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
aType, // reload type
aLocalIP, // load attributes.
aReferrer); // referrer
+
+ // Fix for bug 1646. Change the notion of current url and referrer only after
+ // the document load succeeds.
+ if (NS_SUCCEEDED(rv)) {
+ mURL = urlSpec;
+ mReferrer = aReferrer;
+ }
+
+ return rv;
}
NS_IMETHODIMP
diff --git a/webshell/src/nsWebShell.cpp b/webshell/src/nsWebShell.cpp
index 576f64242436..1c8852f9733e 100644
--- a/webshell/src/nsWebShell.cpp
+++ b/webshell/src/nsWebShell.cpp
@@ -1978,14 +1978,6 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
rv = aUri->GetSpec(getter_Copies(urlSpec));
if (NS_FAILED(rv)) return rv;
- /* mURL is being set the value again so that calls to DoLoadURL() from Viewer
- * will work right. This statement could go to Goto(), but that really is
- * Vidur's call
- */
- mURL = urlSpec;
-
- mReferrer = aReferrer;
-
// If it's a normal reload that uses the cache, look at the destination anchor
// and see if it's an element within the current document
// We don't have a reload loadtype yet in necko. So, check for just history
@@ -2092,8 +2084,7 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
/* WebShell was primarily passing the buck when it came to streamObserver.
* So, pass on the observer which is already a streamObserver to DocLoder.
*/
-
- return mDocLoader->LoadDocument(aUri, // URL string
+ rv = mDocLoader->LoadDocument(aUri, // URL string
aCommand, // Command
this, // Container
aPostDataStream, // Post Data
@@ -2101,6 +2092,15 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
aType, // reload type
aLocalIP, // load attributes.
aReferrer); // referrer
+
+ // Fix for bug 1646. Change the notion of current url and referrer only after
+ // the document load succeeds.
+ if (NS_SUCCEEDED(rv)) {
+ mURL = urlSpec;
+ mReferrer = aReferrer;
+ }
+
+ return rv;
}
NS_IMETHODIMP