diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-08 08:06:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-08 08:06:12 -0700 |
| commit | ecc88dcc9bcc917892396ed149e0c254b4b177a3 (patch) | |
| tree | 97bd9a643e1a96528201d293ed499eea1fba33d6 /WebCore/xml/XMLHttpRequest.cpp | |
| parent | d88ddb512f90bbb26b918b3e0bcebf5a636ba19b (diff) | |
| parent | df1815070cfd8d2ed6f7101d1b8d60d037c839e6 (diff) | |
| download | external_webkit-ecc88dcc9bcc917892396ed149e0c254b4b177a3.zip external_webkit-ecc88dcc9bcc917892396ed149e0c254b4b177a3.tar.gz external_webkit-ecc88dcc9bcc917892396ed149e0c254b4b177a3.tar.bz2 | |
Merge change 3067 into donut
* changes:
browser security patches
Diffstat (limited to 'WebCore/xml/XMLHttpRequest.cpp')
| -rw-r--r-- | WebCore/xml/XMLHttpRequest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp index f16755a..b62679b 100644 --- a/WebCore/xml/XMLHttpRequest.cpp +++ b/WebCore/xml/XMLHttpRequest.cpp @@ -934,6 +934,7 @@ void XMLHttpRequest::networkError() if (m_upload) m_upload->dispatchErrorEvent(); } + internalAbort(); } void XMLHttpRequest::abortError() @@ -1159,7 +1160,6 @@ void XMLHttpRequest::didFail() if (m_error) return; - internalAbort(); networkError(); } @@ -1294,7 +1294,7 @@ void XMLHttpRequest::didReceiveAuthenticationCancellation(const ResourceResponse void XMLHttpRequest::didReceiveData(const char* data, int len) { - if (m_inPreflight) + if (m_inPreflight || m_error) return; if (m_state < HEADERS_RECEIVED) |