From cbd589f16e42c030ba1f7a8e42c4775860bcc84d Mon Sep 17 00:00:00 2001
From: "mscott%netscape.com"
 <mscott%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Apr 2000 20:41:38 +0000
Subject: [PATCH] Bug #36218 --> fix ftp! We were unable to open the unknown
 content handler because we couldn't get the dom window from the original
 docshell. I changed it to make this possible.

git-svn-id: svn://10.0.0.236/trunk@66301 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/uriloader/base/nsURILoader.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp
index cccad15906c..8a8cda1014a 100644
--- a/mozilla/uriloader/base/nsURILoader.cpp
+++ b/mozilla/uriloader/base/nsURILoader.cpp
@@ -286,6 +286,7 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIChannel * aChannel, nsISupports
 {
   nsresult rv;
   nsXPIDLCString contentType;
+  nsCOMPtr<nsISupports> originalWindowContext = m_originalContext; // local variable to keep track of this.
 
   rv = aChannel->GetContentType(getter_Copies(contentType));
   if (NS_FAILED(rv)) return rv;
@@ -405,7 +406,7 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIChannel * aChannel, nsISupports
 
       if (NS_FAILED(rv))
       {
-        nsCOMPtr<nsIDOMWindow> domWindow (do_GetInterface(contentListener));
+        nsCOMPtr<nsIDOMWindow> domWindow (do_GetInterface(originalWindowContext));
         return InvokeUnknownContentHandler(aChannel, contentType, domWindow);
       }