From 1b833f021f3622018dfc1bbf1f3630963270fc76 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sun, 27 Feb 2005 19:34:11 +0000 Subject: [PATCH] Switch some internal users of text/xml to application/xml. Bug 247024, patch by Anne van Kesteren , r+sr=bzbarsky --- .../inspector/resources/content/search/inSearchService.js | 2 +- .../resources/content/viewers/xblBindings/xblBindings.js | 2 +- extensions/p3p/resources/content/nsPolicyViewer.js | 2 +- extensions/schema-validation/tests/schema.html | 4 ++-- extensions/transformiix/resources/XSLTMark/XSLTMark-test.js | 4 ++-- extensions/transformiix/resources/buster/buster-test.js | 2 +- extensions/venkman/resources/content/venkman-jsdurl.js | 4 ++-- extensions/webservices/schema/src/nsSchemaLoader.cpp | 4 ++-- extensions/webservices/security/src/nsWebScriptsAccess.cpp | 2 +- extensions/xmlextras/tests/TestXMLExtras.cpp | 4 ++-- extensions/xmlextras/tests/echo.cgi | 2 +- extensions/xmlextras/tests/parseserialize.html | 2 +- extensions/xmlextras/tests/parseserializedisplay.html | 2 +- extensions/xmlterm/base/mozXMLTermSession.cpp | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/extensions/inspector/resources/content/search/inSearchService.js b/extensions/inspector/resources/content/search/inSearchService.js index c6cb947ba79d..79dc7add32ac 100644 --- a/extensions/inspector/resources/content/search/inSearchService.js +++ b/extensions/inspector/resources/content/search/inSearchService.js @@ -177,7 +177,7 @@ inSearchService.prototype = // This method of loading the xml doesn't work, but it should. See bug 54237... var doc = document.implementation.createDocument("", "", null); doc.addEventListener("load", SearchFileLoadListener, false); - doc.load(aURL, "text/xml"); + doc.load(aURL, "application/xml"); */ }, diff --git a/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.js b/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.js index 59f6972c66f5..d7d9f8d82b4c 100644 --- a/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.js +++ b/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.js @@ -199,7 +199,7 @@ XBLBindings.prototype = if (aURL) { var doc = document.implementation.createDocument(null, "", null); doc.addEventListener("load", gDocLoadListener, true); - doc.load(aURL, "text/xml"); + doc.load(aURL, "application/xml"); this.mBindingDoc = doc; this.mBindingURL = aURL; diff --git a/extensions/p3p/resources/content/nsPolicyViewer.js b/extensions/p3p/resources/content/nsPolicyViewer.js index 4c051a7d6cbd..fa86dc54c14a 100755 --- a/extensions/p3p/resources/content/nsPolicyViewer.js +++ b/extensions/p3p/resources/content/nsPolicyViewer.js @@ -263,7 +263,7 @@ nsPolicyViewer.prototype = this.mXMLHttpRequest.onload = this; // Override the mime type because without it XMLHttpRequest hangs // on certain sites that serve HTML instead ofXML. - this.mXMLHttpRequest.overrideMimeType("text/xml"); + this.mXMLHttpRequest.overrideMimeType("application/xml"); this.mXMLHttpRequest.open("GET", aLocation); this.mXMLHttpRequest.send(null); } diff --git a/extensions/schema-validation/tests/schema.html b/extensions/schema-validation/tests/schema.html index 1fa7d8646c39..291337dcc09e 100644 --- a/extensions/schema-validation/tests/schema.html +++ b/extensions/schema-validation/tests/schema.html @@ -29,7 +29,7 @@ function validateDOMNode(aNodeValue, aType, aIsValid) { var rv = false; - var x = dp.parseFromString('' + aNodeValue + '', "text/xml"); + var x = dp.parseFromString('' + aNodeValue + '', "application/xml"); rv = getValidator().validate(x.documentElement); counter++; @@ -50,7 +50,7 @@ function validateComplexType(aNodeValue, aType, aIsValid){ var rv = false; - var x = dp.parseFromString(aNodeValue, "text/xml") + var x = dp.parseFromString(aNodeValue, "application/xml") rv = getValidator().validate(x.documentElement); counter++; diff --git a/extensions/transformiix/resources/XSLTMark/XSLTMark-test.js b/extensions/transformiix/resources/XSLTMark/XSLTMark-test.js index 905130f5d9d9..47eb058e7099 100644 --- a/extensions/transformiix/resources/XSLTMark/XSLTMark-test.js +++ b/extensions/transformiix/resources/XSLTMark/XSLTMark-test.js @@ -48,8 +48,8 @@ function Test(aTitle, aSourceURL, aStyleURL, aNumber, aObserver) this.mDone = 0; var xmlcontent = loadFile(aSourceURL); var xslcontent = loadFile(aStyleURL); - this.mSource = gParser.parseFromString(xmlcontent, 'text/xml'); - this.mStyle = gParser.parseFromString(xslcontent, 'text/xml'); + this.mSource = gParser.parseFromString(xmlcontent, 'application/xml'); + this.mStyle = gParser.parseFromString(xslcontent, 'application/xml'); } function runTest(aTitle, aSourceURL, aStyleURL, aNumber, aObserver) diff --git a/extensions/transformiix/resources/buster/buster-test.js b/extensions/transformiix/resources/buster/buster-test.js index 604ea1800a63..0bf51a40cfd5 100644 --- a/extensions/transformiix/resources/buster/buster-test.js +++ b/extensions/transformiix/resources/buster/buster-test.js @@ -271,7 +271,7 @@ runItem.prototype = if (!refContent) { refContent = this.loadTextFile(this.mRefURL); } - this.mRefDoc = parser.parseFromString(refContent, 'text/xml'); + this.mRefDoc = parser.parseFromString(refContent, 'application/xml'); this.mLoaded += 4; break; case 'html': diff --git a/extensions/venkman/resources/content/venkman-jsdurl.js b/extensions/venkman/resources/content/venkman-jsdurl.js index 8346e36c3779..0ee78cebc9eb 100644 --- a/extensions/venkman/resources/content/venkman-jsdurl.js +++ b/extensions/venkman/resources/content/venkman-jsdurl.js @@ -824,7 +824,7 @@ function con_respondsourcetext (response, sourceText) if ("markup" in sourceText) { - response.channel.contentType = "text/xml"; + response.channel.contentType = "application/xml"; response.start(); response.append(sourceText.markup); response.end(); @@ -833,7 +833,7 @@ function con_respondsourcetext (response, sourceText) { maxDigits = Math.floor(Math.log(sourceLines.length) / Math.LN10) + 1; dd ("OFF building response {"); - response.channel.contentType = "text/xml"; + response.channel.contentType = "application/xml"; resultSource = "OverrideMimeType(NS_LITERAL_CSTRING("text/xml")); + rv = request->OverrideMimeType(NS_LITERAL_CSTRING("application/xml")); if (NS_FAILED(rv)) { return rv; } @@ -746,7 +746,7 @@ nsSchemaLoader::LoadAsync(const nsAString& schemaURI, } // Force the mimetype of the returned stream to be xml. - rv = request->OverrideMimeType(NS_LITERAL_CSTRING("text/xml")); + rv = request->OverrideMimeType(NS_LITERAL_CSTRING("application/xml")); if (NS_FAILED(rv)) { return rv; } diff --git a/extensions/webservices/security/src/nsWebScriptsAccess.cpp b/extensions/webservices/security/src/nsWebScriptsAccess.cpp index d03c627111da..abb712fee503 100755 --- a/extensions/webservices/security/src/nsWebScriptsAccess.cpp +++ b/extensions/webservices/security/src/nsWebScriptsAccess.cpp @@ -214,7 +214,7 @@ nsWebScriptsAccess::GetDocument(const nsACString& aDeclFilePath, PR_FALSE, empty, empty); NS_ENSURE_SUCCESS(rv, rv); - rv = mRequest->OverrideMimeType(NS_LITERAL_CSTRING("text/xml")); + rv = mRequest->OverrideMimeType(NS_LITERAL_CSTRING("application/xml")); NS_ENSURE_SUCCESS(rv, rv); rv = mRequest->Send(0); diff --git a/extensions/xmlextras/tests/TestXMLExtras.cpp b/extensions/xmlextras/tests/TestXMLExtras.cpp index e9d801da60a9..441b0393bc91 100644 --- a/extensions/xmlextras/tests/TestXMLExtras.cpp +++ b/extensions/xmlextras/tests/TestXMLExtras.cpp @@ -153,7 +153,7 @@ int main (int argc, char* argv[]) if (NS_SUCCEEDED( rv )) { nsString str; str.AssignWithConversion(argv[2]); - rv = pDOMParser->ParseFromString(str.get(), "text/xml", + rv = pDOMParser->ParseFromString(str.get(), "application/xml", getter_AddRefs( pDOMDocument ) ); if (NS_SUCCEEDED( rv )) { @@ -193,7 +193,7 @@ int main (int argc, char* argv[]) rv = pDOMParser->ParseFromStream( pInputStream, "UTF-8", uiContentLength, - "text/xml", + "application/xml", getter_AddRefs( pDOMDocument ) ); if (NS_SUCCEEDED( rv )) { printf( "DOM parse of %s successful\n", argv[2] ); diff --git a/extensions/xmlextras/tests/echo.cgi b/extensions/xmlextras/tests/echo.cgi index 2a436b06c284..2def8814c89a 100644 --- a/extensions/xmlextras/tests/echo.cgi +++ b/extensions/xmlextras/tests/echo.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -print "Content-type: text/xml\n\n"; +print "Content-type: application/xml\n\n"; print "\n"; if ($ENV{'REQUEST_METHOD'} eq 'POST') diff --git a/extensions/xmlextras/tests/parseserialize.html b/extensions/xmlextras/tests/parseserialize.html index 266bf5864ce9..5fc8885b86a3 100644 --- a/extensions/xmlextras/tests/parseserialize.html +++ b/extensions/xmlextras/tests/parseserialize.html @@ -21,7 +21,7 @@ function execute() var parser = new DOMParser(); var str = '\n\n]>\n\n One Two\n Three\n\n'; - var doc = parser.parseFromString(str,"text/xml"); + var doc = parser.parseFromString(str,"application/xml"); document.getElementById("id1").firstChild.nodeValue = str; document.getElementById("id2").firstChild.nodeValue = doc; diff --git a/extensions/xmlextras/tests/parseserializedisplay.html b/extensions/xmlextras/tests/parseserializedisplay.html index 125220143756..e15924d0c638 100644 --- a/extensions/xmlextras/tests/parseserializedisplay.html +++ b/extensions/xmlextras/tests/parseserializedisplay.html @@ -21,7 +21,7 @@ function execute() var parser = new DOMParser(); var str = '\n\n\n]>\n\n One Two\n Three\n\n'; - var doc = parser.parseFromString(str,"text/xml"); + var doc = parser.parseFromString(str,"application/xml"); document.getElementById("id1").firstChild.nodeValue = str; document.getElementById("id2").firstChild.nodeValue = doc; diff --git a/extensions/xmlterm/base/mozXMLTermSession.cpp b/extensions/xmlterm/base/mozXMLTermSession.cpp index 5f084c8d9a23..313d390c6e61 100644 --- a/extensions/xmlterm/base/mozXMLTermSession.cpp +++ b/extensions/xmlterm/base/mozXMLTermSession.cpp @@ -1569,7 +1569,7 @@ NS_IMETHODIMP mozXMLTermSession::InitStream(const nsString& streamURL, break; case XML_DOCUMENT: - contentType = "text/xml"; + contentType = "application/xml"; break; default: