aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2010-09-21 16:13:50 -0400
committerJohn Resig <jeresig@gmail.com>2010-09-21 16:13:50 -0400
commitdc8491defe5360afe076249a696f72f73a96dc23 (patch)
tree4de4b2a2b3dc9392ac807762933c5a9543629db8 /src
parentba9e0fc177841bd74cc5ea4e52f09cd87d747bf5 (diff)
downloadjquery-dc8491defe5360afe076249a696f72f73a96dc23.tar.gz
jquery-dc8491defe5360afe076249a696f72f73a96dc23.zip
Scratch that, just punting on Opera and 304s for now - there may not be a good solution here. Fixes #6060.
Diffstat (limited to 'src')
-rw-r--r--src/ajax.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ajax.js b/src/ajax.js
index aa4e3ec45..bfae78244 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -629,11 +629,8 @@ jQuery.extend( jQuery.ajax, {
try {
// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
return !xhr.status && location.protocol === "file:" ||
- ( xhr.status >= 200 && xhr.status < 300 ) ||
- xhr.status === 304 || xhr.status === 1223 ||
- // Opera returns a status of 0 for redirects -
- // We can detect this by the fact that Opera also doesn't return any headers
- xhr.status === 0 && !xhr.getAllResponseHeaders();
+ xhr.status >= 200 && xhr.status < 300 ||
+ xhr.status === 304 || xhr.status === 1223;
} catch(e) {}
return false;
@@ -652,8 +649,7 @@ jQuery.extend( jQuery.ajax, {
jQuery.ajax.etag[url] = etag;
}
- // Opera returns 0 when status is 304
- return xhr.status === 304 || xhr.status === 0 && !xhr.getAllResponseHeaders();
+ return xhr.status === 304;
},
httpData: function( xhr, type, s ) {