Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When calling open() on an in-progress XMLHttpRequest, abort the request but still allow the open() to reinitialize it. Bug 322317, r+sr=sicking, a=vlad

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2007-11-15 14:18:36 -08:00
parent f032ec33d7
commit bdb6e36dd6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1227,18 +1227,11 @@ nsXMLHttpRequest::OpenRequest(const nsACString& method,
nsCOMPtr<nsIURI> uri;
PRBool authp = PR_FALSE;
if (mState & XML_HTTP_REQUEST_ABORTED) {
// Something caused this request to abort (e.g the current request
// was caceled, channels closed etc), most likely the abort()
// function was called by script. Unset our aborted state, and
// proceed as normal
mState &= ~XML_HTTP_REQUEST_ABORTED;
} else if (mState & (XML_HTTP_REQUEST_OPENED |
XML_HTTP_REQUEST_LOADED |
XML_HTTP_REQUEST_INTERACTIVE |
XML_HTTP_REQUEST_SENT |
XML_HTTP_REQUEST_STOPPED)) {
if (mState & (XML_HTTP_REQUEST_OPENED |
XML_HTTP_REQUEST_LOADED |
XML_HTTP_REQUEST_INTERACTIVE |
XML_HTTP_REQUEST_SENT |
XML_HTTP_REQUEST_STOPPED)) {
// IE aborts as well
Abort();
@ -1247,8 +1240,15 @@ nsXMLHttpRequest::OpenRequest(const nsACString& method,
// since this looks like a situation that could happen
// by accident and you could spend a lot of time wondering
// why things didn't work.
}
return NS_OK;
if (mState & XML_HTTP_REQUEST_ABORTED) {
// Something caused this request to abort (e.g the current request
// was caceled, channels closed etc), most likely the abort()
// function was called by script. Unset our aborted state, and
// proceed as normal
mState &= ~XML_HTTP_REQUEST_ABORTED;
}
if (async) {