Use a different workaround for detecting when Opera finds a status 304 page. Fixes...

diff --git a/src/ajax.js b/src/ajax.js
index 78d9b24f1565f8913c3e8ae8f6bbba9a71802a09..aa4e3ec450ec519621f24f72e0c154072f571a51 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -629,9 +629,11 @@ 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:" ||
-                               // Opera returns 0 when status is 304
                                ( xhr.status >= 200 && xhr.status < 300 ) ||
-                               xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
+                               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();
                } catch(e) {}
 
                return false;
@@ -651,7 +653,7 @@ jQuery.extend( jQuery.ajax, {
                }
 
                // Opera returns 0 when status is 304
-               return xhr.status === 304 || xhr.status === 0;
+               return xhr.status === 304 || xhr.status === 0 && !xhr.getAllResponseHeaders();
        },
 
        httpData: function( xhr, type, s ) {

diff --git a/test/data/notmodified.php b/test/data/notmodified.php
new file mode 100644 (file)
index 0000000..0309a6b
--- /dev/null
+++ b/test/data/notmodified.php
@@ -0,0 +1 @@
+<?php header('HTTP/1.0 304 Not Modified'); exit; ?>

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 8e3c4b67072d08f28a4a1d1a426542c721d20d61..7f3f39aff46c370ceed5e25c47f940fce8b83bdb 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -68,6 +68,18 @@ test("jQuery.ajax() - error callbacks", function() {
        });
 });
 
+test(".ajax() - 304", function() {
+       expect( 1 );
+       stop();
+
+       jQuery.ajax({
+               url: url("data/notmodified.php"),
+               success: function(){ ok(true, "304 ok"); },
+               error: function(){ ok(false, "304 not ok "); },
+               complete: function(xhr){ start(); }
+       });
+});
+
 test(".load()) - 404 error callbacks", function() {
        expect( 6 );
        stop();