X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=bfae7824478b2090dcf5bfc3065519379e498c8d;hb=dc8491defe5360afe076249a696f72f73a96dc23;hp=aa4e3ec450ec519621f24f72e0c154072f571a51;hpb=ba9e0fc177841bd74cc5ea4e52f09cd87d747bf5;p=jquery.git 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 ) {