зеркало из https://github.com/mozilla/pjs.git
Bug #34769 (this change is actually dougt's). Don't allow the chrome cache channel to stomp on it's original
uri if it's already been set. r=waterson,mscott a=leaf
This commit is contained in:
Родитель
95ae0d5e57
Коммит
1ef7bc6ebd
|
@ -183,8 +183,11 @@ nsCachedChromeChannel::GetOriginalURI(nsIURI* *aOriginalURI)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsCachedChromeChannel::SetOriginalURI(nsIURI* aOriginalURI)
|
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;
|
mURI = aOriginalURI;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
|
|
@ -183,8 +183,11 @@ nsCachedChromeChannel::GetOriginalURI(nsIURI* *aOriginalURI)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsCachedChromeChannel::SetOriginalURI(nsIURI* aOriginalURI)
|
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;
|
mURI = aOriginalURI;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
|
Загрузка…
Ссылка в новой задаче