Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

335561 - nsChromeProtocolHandler does not respect original URI. r+sr=bz

Browse Source
This commit is contained in:
beng%bengoodger.com 2006-04-27 00:24:20 +00:00
parent 554d27c6a6
commit aa2653da83
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chrome/src/nsChromeProtocolHandler.cpp
View File

@ -109,6 +109,7 @@ protected:
~nsCachedChromeChannel();
nsCOMPtr<nsIURI> mURI;
nsCOMPtr<nsIURI> mOriginalURI;
nsCOMPtr<nsILoadGroup> mLoadGroup;
nsCOMPtr<nsIStreamListener> mListener;
nsCOMPtr<nsISupports> mContext;
@ -158,7 +159,6 @@ NS_IMPL_ISUPPORTS2(nsCachedChromeChannel,
nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI)
: mURI(aURI)
, mLoadGroup(nsnull)
, mLoadFlags(nsIRequest::LOAD_NORMAL)
, mStatus(NS_OK)
{
@ -180,7 +180,7 @@ nsCachedChromeChannel::~nsCachedChromeChannel()
NS_IMETHODIMP
nsCachedChromeChannel::GetOriginalURI(nsIURI* *aOriginalURI)
{
*aOriginalURI = mURI;
*aOriginalURI = mOriginalURI ? mOriginalURI : mURI;
NS_ADDREF(*aOriginalURI);
return NS_OK;
}
@ -188,10 +188,7 @@ nsCachedChromeChannel::GetOriginalURI(nsIURI* *aOriginalURI)
NS_IMETHODIMP
nsCachedChromeChannel::SetOriginalURI(nsIURI* aOriginalURI)
{
// don't stp on a uri if we already have one there...this is a work around fix
// for Bug #34769.
if (!mURI)
mURI = aOriginalURI;
mOriginalURI = aOriginalURI;
return NS_OK;
}

14
rdf/chrome/src/nsChromeProtocolHandler.cpp
View File

@ -115,6 +115,7 @@ protected:
virtual ~nsCachedChromeChannel();
nsCOMPtr<nsIURI> mURI;
nsCOMPtr<nsIURI> mOriginalURI;
nsCOMPtr<nsILoadGroup> mLoadGroup;
nsCOMPtr<nsIStreamListener> mListener;
nsCOMPtr<nsISupports> mContext;
@ -187,7 +188,9 @@ nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult)
nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI)
: mURI(aURI), mLoadGroup(nsnull), mLoadFlags (nsIRequest::LOAD_NORMAL), mStatus(NS_OK)
: mURI(aURI),
mLoadFlags (nsIRequest::LOAD_NORMAL),
mStatus(NS_OK)
{
#ifdef PR_LOGGING
if (! gLog)
@ -209,7 +212,7 @@ nsCachedChromeChannel::~nsCachedChromeChannel()
NS_IMETHODIMP
nsCachedChromeChannel::GetOriginalURI(nsIURI* *aOriginalURI)
{
*aOriginalURI = mURI;
*aOriginalURI = mOriginalURI ? mOriginalURI : mURI;
NS_ADDREF(*aOriginalURI);
return NS_OK;
}
@ -217,11 +220,8 @@ nsCachedChromeChannel::GetOriginalURI(nsIURI* *aOriginalURI)
NS_IMETHODIMP
nsCachedChromeChannel::SetOriginalURI(nsIURI* aOriginalURI)
{
// don't stp on a uri if we already have one there...this is a work around fix
// for Bug #34769.
if (!mURI)
mURI = aOriginalURI;
return NS_OK;
mOriginalURI = aOriginalURI;
return NS_OK;
}
NS_IMETHODIMP