From ef426ce17e6c1efcdd6642d059edd5bb6da46b11 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Tue, 21 Jul 1998 16:43:48 +0000 Subject: [PATCH] Get correct url to open for script src= git-svn-id: svn://10.0.0.236/trunk@6068 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/html/document/src/nsHTMLContentSink.cpp | 10 +++++++--- mozilla/layout/html/document/src/nsHTMLContentSink.cpp | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index b1d88192d3e..f4ad2613e1e 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -1554,9 +1554,13 @@ nsresult HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode) if (nsnull != src) { // Use the SRC attribute value to open a blocking stream nsIURL* url = nsnull; - char* spec = src->ToNewCString(); - rv = NS_NewURL(&url, nsnull, spec); - delete spec; + nsAutoString absURL, baseURL;/* XXX */ + nsIURL* docURL = mDocument->GetDocumentURL(); + rv = NS_MakeAbsoluteURL(docURL, baseURL, *src, absURL); + if (NS_OK != rv) { + return rv; + } + rv = NS_NewURL(&url, nsnull, absURL); delete src; if (NS_OK != rv) { return rv; diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index b1d88192d3e..f4ad2613e1e 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -1554,9 +1554,13 @@ nsresult HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode) if (nsnull != src) { // Use the SRC attribute value to open a blocking stream nsIURL* url = nsnull; - char* spec = src->ToNewCString(); - rv = NS_NewURL(&url, nsnull, spec); - delete spec; + nsAutoString absURL, baseURL;/* XXX */ + nsIURL* docURL = mDocument->GetDocumentURL(); + rv = NS_MakeAbsoluteURL(docURL, baseURL, *src, absURL); + if (NS_OK != rv) { + return rv; + } + rv = NS_NewURL(&url, nsnull, absURL); delete src; if (NS_OK != rv) { return rv;