From 4e309e8bd7de85ee2e92a5a9f80cea2c84b19ba6 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Mon, 10 Apr 2000 00:25:22 +0000 Subject: [PATCH] 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 git-svn-id: svn://10.0.0.236/trunk@65541 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/chrome/src/nsChromeProtocolHandler.cpp | 5 ++++- mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp index e54813af0ba..124b2ddca4c 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp @@ -183,8 +183,11 @@ 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; + return NS_OK; } NS_IMETHODIMP diff --git a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp index e54813af0ba..124b2ddca4c 100644 --- a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -183,8 +183,11 @@ 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; + return NS_OK; } NS_IMETHODIMP