Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 48200. We were incorrectly setting mDocumentURI to the OriginalURI which completely broke redirects (which are conveyed thru URI and not OriginalURI) r=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@76802 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gagan%netscape.com 2000-08-21 22:37:02 +00:00
parent bdfc2977d4
commit bc90969808
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/content/base/src/nsDocument.cpp
View File

@ -930,7 +930,17 @@ nsDocument::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup)
NS_IF_RELEASE(mNameSpaceManager);
if (aChannel) {
(void)aChannel->GetOriginalURI(&mDocumentURL);
nsCOMPtr<nsIURI> uri;
(void) aChannel->GetOriginalURI(getter_AddRefs(uri));
nsXPIDLCString scheme;
(void)uri->GetScheme(getter_Copies(scheme));
if (scheme && ((0 == PL_strncmp((const char*)scheme, "chrome", 6)) ||
(0 == PL_strncmp((const char*)scheme, "resource", 8))))
(void)aChannel->GetOriginalURI(&mDocumentURL);
else
(void)aChannel->GetURI(&mDocumentURL);
nsCOMPtr<nsISupports> owner;
aChannel->GetOwner(getter_AddRefs(owner));
if (owner)

12
mozilla/layout/base/src/nsDocument.cpp
View File

@ -930,7 +930,17 @@ nsDocument::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup)
NS_IF_RELEASE(mNameSpaceManager);
if (aChannel) {
(void)aChannel->GetOriginalURI(&mDocumentURL);
nsCOMPtr<nsIURI> uri;
(void) aChannel->GetOriginalURI(getter_AddRefs(uri));
nsXPIDLCString scheme;
(void)uri->GetScheme(getter_Copies(scheme));
if (scheme && ((0 == PL_strncmp((const char*)scheme, "chrome", 6)) ||
(0 == PL_strncmp((const char*)scheme, "resource", 8))))
(void)aChannel->GetOriginalURI(&mDocumentURL);
else
(void)aChannel->GetURI(&mDocumentURL);
nsCOMPtr<nsISupports> owner;
aChannel->GetOwner(getter_AddRefs(owner));
if (owner)