Make sure that requests without a body don't set contentType, and a z…

…ero-length body is sent rather than null. Possible fix for #6811 and #6674, needs testing from someone who could repro the original problem.

src/ajax.js

@@ -4,6 +4,7 @@ var jsc = jQuery.now(),
 	rscript = /<script(.|\s)*?\/script>/gi,
 	rselectTextarea = /select|textarea/i,
 	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
+	rnoContent = /^GET|HEAD|DELETE$/,
 	jsre = /\=\?(&|$)/,
 	rquery = /\?/,
 	rts = /(\?|&)_=.*?(&|$)/,
@@ -202,7 +203,7 @@ jQuery.extend({
 
 	ajax: function( origSettings ) {
 		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
-			jsonp, status, data, type = s.type.toUpperCase();
+			jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
 
 		// Use original (not extended) context object if it was provided
 		s.context = ( origSettings && origSettings.context !== undefined )? origSettings.context : s;
@@ -351,8 +352,8 @@ jQuery.extend({
 
 		// Need an extra try/catch for cross domain requests in Firefox 3
 		try {
-			// Set the correct header, if data is being sent
-			if ( s.data || type === "POST" || origSettings.contentType ) {
+			// Set content-type if data specified and content-body is valid for this type
+			if ( (s.data != null && !noContent) || (origSettings && origSettings.contentType) ) {
 				xhr.setRequestHeader("Content-Type", s.contentType);
 			}
 
@@ -487,7 +488,7 @@ jQuery.extend({
 
 		// Send the data
 		try {
-			xhr.send( (type !== "GET" && s.data) || null );
+			xhr.send( (noContent || s.data == null)? null : s.data );
 
 		} catch( e ) {
 			jQuery.ajax.handleError( s, xhr, null, e );