wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

imported patch bug431701

Browse Source
This commit is contained in:
Boris Zbarsky 2008-08-28 08:56:45 -04:00
parent 9941099a86
commit 0b32650b29
4 changed files with 135 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/base/src/nsXMLHttpRequest.cpp
View File

@ -885,15 +885,9 @@ nsXMLHttpRequest::ConvertBodyToText(nsAString& aOutBuffer)
nsresult rv = NS_OK;
nsCAutoString dataCharset;
nsCOMPtr<nsIDOM3Document> document(do_QueryInterface(mDocument));
nsCOMPtr<nsIDocument> document(do_QueryInterface(mDocument));
if (document) {
nsAutoString inputEncoding;
document->GetInputEncoding(inputEncoding);
if (DOMStringIsNull(inputEncoding)) {
dataCharset.AssignLiteral("UTF-8");
} else {
CopyUTF16toUTF8(inputEncoding, dataCharset);
}
dataCharset = document->GetDocumentCharacterSet();
} else {
if (NS_FAILED(DetectCharset(dataCharset)) || dataCharset.IsEmpty()) {
// MS documentation states UTF-8 is default for responseText
@ -1940,9 +1934,15 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rv));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDocument> baseDoc(do_QueryInterface(doc));
if (baseDoc) {
charset = baseDoc->GetDocumentCharacterSet();
nsCOMPtr<nsIDOM3Document> dom3doc(do_QueryInterface(doc));
if (dom3doc) {
nsAutoString inputEncoding;
dom3doc->GetInputEncoding(inputEncoding);
if (DOMStringIsNull(inputEncoding)) {
charset.AssignLiteral("UTF-8");
} else {
CopyUTF16toUTF8(inputEncoding, charset);
}
}
// Serialize to a stream so that the encoding used will

1
content/base/test/Makefile.in
View File

@ -184,6 +184,7 @@ _TEST_FILES = test_bug5141.html \
file_bug428847-1.xhtml \
file_bug428847-2.xhtml \
test_bug425201.html \
test_bug431701.html \
test_bug431833.html \
test_bug435425.html \
bug435425.sjs \

120
content/base/test/test_bug431701.html Normal file
View File

@ -0,0 +1,120 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=431701
-->
<head>
<title>Test for Bug 431701</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=431701">Mozilla Bug 431701</a>
<p id="display"></p>
<div id="content" style="display: none">
<iframe id="one"></iframe>
<iframe id="two"></iframe>
<iframe id="three"></iframe>
<iframe id="four"></iframe>
<iframe id="five"></iframe>
<iframe id="six"></iframe>
<iframe id="seven"></iframe>
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 431701 **/
SimpleTest.waitForExplicitFinish();
var docSources = [
"data:text/html,<html></html>",
"data:text/html;charset=UTF-8,<html></html>",
"data:text/html;charset=ISO-8859-1,<html></html>",
"data:text/xml,<html></html>",
"data:text/xml,<?xml version='1.0'?><html></html>",
"data:text/xml,<?xml version='1.0' encoding='UTF-8'?><html></html>",
"data:text/xml,<?xml version='1.0' encoding='ISO-8859-1'?><html></html>",
];
for (var i = 0; i < docSources.length; ++i) {
document.getElementsByTagName("iframe")[i].src = docSources[i];
}
function frameDoc(id) {
return function() { return $(id).contentDocument; };
}
function createDoc() {
return document.implementation.createDocument('', 'html', null);
}
function xhrDoc(idx) {
return function() {
// Defy same-origin restrictions!
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var xhr = new XMLHttpRequest();
xhr.open("GET", docSources[idx], false);
xhr.send();
return xhr.responseXML;
};
}
// Each row has the document getter function, then the characterSet,
// inputEncoding, xmlEncoding expected for that document.
var tests = [
[ frameDoc("one"), "ISO-8859-1", "ISO-8859-1", null ],
[ frameDoc("two"), "UTF-8", "UTF-8", null ],
[ frameDoc("three"), "ISO-8859-1", "ISO-8859-1", null ],
[ frameDoc("four"), "UTF-8", "UTF-8", null ],
[ frameDoc("five"), "UTF-8", "UTF-8", null ],
[ frameDoc("six"), "UTF-8", "UTF-8", "UTF-8"],
[ frameDoc("seven"), "ISO-8859-1", "ISO-8859-1", "ISO-8859-1" ],
[ createDoc, "UTF-8", null, null ],
[ xhrDoc(4), "UTF-8", "UTF-8", null ],
[ xhrDoc(5), "UTF-8", "UTF-8", "UTF-8" ],
[ xhrDoc(6), "ISO-8859-1", "ISO-8859-1", "ISO-8859-1" ],
];
function doTest(idx) {
var [docGetter, expectedCharacterSet,
expectedInputEncoding, expectedXMLEncoding] = tests[idx];
var doc = docGetter();
// Have to be careful here to catch null vs ""
is(doc.characterSet, expectedCharacterSet, "Test " + idx + " characterSet");
is(doc.inputEncoding, expectedInputEncoding,
"Test " + idx + " inputEncoding");
is(doc.xmlEncoding, expectedXMLEncoding, "Test " + idx + " xmlEncoding");
}
addLoadEvent(function() {
// sanity check
isnot("", null, "Shouldn't be equal!");
for (var i = 0; i < tests.length; ++i) {
doTest(i);
}
// Now check what xhr does
var xhr = new XMLHttpRequest();
xhr.open("POST", document.location.href);
xhr.send(createDoc());
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
is(xhr.channel.QueryInterface(Components.interfaces.nsIHttpChannel)
.getRequestHeader("Content-Type"),
"application/xml; charset=UTF-8", "Testing correct type on the wire");
xhr.abort();
SimpleTest.finish();
});
</script>
</pre>
</body>
</html>

3
content/xml/document/src/nsXMLDocument.cpp
View File

@ -133,6 +133,9 @@ NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult,
doc->SetPrincipal(aPrincipal);
doc->SetBaseURI(aBaseURI);
// XMLDocuments get to be UTF-8 by default, unlike the legacy HTML mess
doc->SetDocumentCharacterSet(NS_LITERAL_CSTRING("UTF-8"));
if (aDoctype) {
nsCOMPtr<nsIDOMNode> tmpNode;
rv = doc->AppendChild(aDoctype, getter_AddRefs(tmpNode));