Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1328470 - XMLHttpRequest should reset timers when send() is executed again, r=smaug

Browse Source
This commit is contained in:
Andrea Marchesini 2017-02-10 15:05:06 +01:00
parent cc005af04c
commit 614673153f
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/xhr/XMLHttpRequestMainThread.cpp
View File

@ -2298,6 +2298,7 @@ XMLHttpRequestMainThread::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
mProgressEventSink = nullptr;
mFlagSyncLooping = false;
mRequestSentTime = 0;
// update our charset and decoder to match mResponseXML,
// before it is possibly nulled out

8
testing/web-platform/meta/MANIFEST.json
View File

@ -80974,6 +80974,14 @@
}
]
],
"XMLHttpRequest/xmlhttprequest-timeout-reused.html": [
[
"/XMLHttpRequest/xmlhttprequest-timeout-reused.html",
{
"timeout": "long"
}
]
],
"XMLHttpRequest/xmlhttprequest-timeout-simple.html": [
[
"/XMLHttpRequest/xmlhttprequest-timeout-simple.html",

48
testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-reused.html Normal file
View File

@ -0,0 +1,48 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>XHR2 Timeout Property Tests</title>
<link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" />
<link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
<link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
<link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
<link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
<link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
<meta name=timeout content=long>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<div id="log"></div>
<script type="text/javascript">
function startRequest() {
xhr.open("GET", "./resources/content.py?content=Hi", true);
xhr.timeout = 2000;
setTimeout(function () {
xhr.send();
}, 1000);
}
var test = async_test();
test.step(function()
{
var count = 0;
xhr = new XMLHttpRequest();
xhr.onload = function () {
assert_equals(xhr.response, "Hi");
if (++count == 2) {
test.done();
}
}
xhr.ontimeout = function () {
assert_unreached("HTTP error should not timeout");
}
startRequest();
setTimeout(startRequest, 3500);
});
</script>
</body>
</html>