Bug 692434 - Use = instead of == for assignment in XHR charset handling code. r=Olli.Pettay.

This commit is contained in:
Henri Sivonen 2011-10-07 14:33:42 +03:00
parent bda7dbfc5b
commit c06a84abb0
4 changed files with 48 additions and 1 deletions

View File

@ -849,7 +849,7 @@ NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(nsAString& aResponseText)
nsCOMPtr<nsIDocument> document = do_QueryInterface(mResponseXML);
if (mResponseCharset != document->GetDocumentCharacterSet()) {
mResponseCharset == document->GetDocumentCharacterSet();
mResponseCharset = document->GetDocumentCharacterSet();
mResponseText.Truncate();
mResponseBodyDecodedPos = 0;

View File

@ -517,6 +517,8 @@ _TEST_FILES2 = \
test_bug684671.html \
test_bug685798.html \
test_bug686449.xhtml \
test_bug692434.html \
file_bug692434.xml \
$(NULL)
_CHROME_FILES = \

View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="windows-1251"?><root>Þ</root>

View File

@ -0,0 +1,44 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=692434
-->
<head>
<title>Test for Bug 692434</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 onload=runTest();>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=692434">Mozilla Bug 692434</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 692434 **/
SimpleTest.waitForExplicitFinish();
var xhr = new XMLHttpRequest();
function runTest() {
xhr.onreadystatechange = function() {
if (this.readyState == 4) {
ok(this.responseXML, "Should have gotten responseXML");
is(this.responseXML.characterSet, "windows-1251", "Wrong character encoding");
is(this.responseXML.documentElement.firstChild.data, "\u042E", "Decoded using the wrong encoding.");
is(this.responseText.indexOf("\u042E"), 51, "Bad responseText");
SimpleTest.finish();
}
}
xhr.open("GET", "file_bug692434.xml");
xhr.send();
}
</script>
</pre>
</body>
</html>