X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=5a6ac26ad67d3245e70ef6e0e563d957b3ff4986;hb=f56b4a22a6cf37b3764939b0338bb545fa6b445f;hp=76f983499e811e959f260ef479ca3711f66dd928;hpb=5b421fed003e6704bd0fbba2dea5c1b6add2cf52;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 76f9834..5a6ac26 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -426,6 +426,14 @@ jQuery.extend({
 					return match || null;
 				},
 
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( state === 0 ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
 				// Cancel the request
 				abort: function( statusText ) {
 					statusText = statusText || "abort";
@@ -509,7 +517,7 @@ jQuery.extend({
 				// We extract error from statusText
 				// then normalize statusText and status for non-aborts
 				error = statusText;
-				if( status ) {
+				if( !statusText || status ) {
 					statusText = "error";
 					if ( status < 0 ) {
 						status = 0;
@@ -827,7 +835,7 @@ function ajaxHandleResponses( s, jqXHR, responses ) {
 	while( dataTypes[ 0 ] === "*" ) {
 		dataTypes.shift();
 		if ( ct === undefined ) {
-			ct = jqXHR.getResponseHeader( "content-type" );
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
 		}
 	}