From dc8491defe5360afe076249a696f72f73a96dc23 Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Tue, 21 Sep 2010 16:13:50 -0400
Subject: [PATCH] Scratch that, just punting on Opera and 304s for now - there
may not be a good solution here. Fixes #6060.
---
src/ajax.js | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/ajax.js b/src/ajax.js
index aa4e3ec..bfae782 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 ) {
--
1.7.10.4