Ajax: send correct "Content-type" if data is set in "beforeSend" method

markelog · markelog · commit 07d43f3dadaa · 2014-10-23T00:03:22.000+04:00
diff --git a/src/ajax.js b/src/ajax.js
@@ -579,11 +579,6 @@ jQuery.extend({
 			}
 		}
 
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
 		// Set the Accepts header for the server, depending on the dataType
 		jqXHR.setRequestHeader(
 			"Accept",
@@ -606,6 +601,11 @@ jQuery.extend({
 			return jqXHR.abort();
 		}
 
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
 		// Aborting is no longer a cancellation
 		strAbort = "abort";
 
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -2022,6 +2022,37 @@ module( "ajax", {
 		});
 	});
 
+	asyncTest( "Send correct \"Content-type\" if data is set in \"beforeSend\" method gh#1801", 2,
+		function() {
+			var oldSetRequestHeader;
+
+			jQuery.ajax({
+				url: "/",
+				method: "post",
+				beforeSend: function( xhr, settings ) {
+					oldSetRequestHeader = xhr.setRequestHeader;
+					settings.data = "test";
+
+					xhr.setRequestHeader = function( name, value ) {
+						strictEqual( name, "Content-Type", "correct header" );
+						strictEqual( value,
+						    "application/x-www-form-urlencoded; charset=UTF-8",
+						    "correct value"
+						);
+					};
+				}
+			}).done(function( data, textStatus, jqXHR ) {
+				jqXHR.old = oldSetRequestHeader;
+
+				start();
+
+			}).fail(function( jqXHR ) {
+				jqXHR.old = oldSetRequestHeader;
+
+				start();
+			});
+	});
+
 //----------- jQuery.active
 
 	test( "jQuery.active", 1, function() {
