Fixes #7881. Setting contentType to false will prevent the Content-Type header from...

diff --git a/src/ajax.js b/src/ajax.js
index 7988ab1ef0f861a253261bd52dfe661f69bb9b29..a814d80bed3c8cdfc8e24380641a91cf31a7f8d7 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -559,7 +559,7 @@ jQuery.extend({
                        }
 
                        // Set the correct header, if data is being sent
-                       if ( ( s.data && s.hasContent ) || options.contentType ) {
+                       if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
                                requestHeaders[ "content-type" ] = s.contentType;
                        }
 

diff --git a/test/data/headers.php b/test/data/headers.php
index c3cb72961b8e4f64f966ebc54ce886971e1e826c..d500b16f45436fce8dc780b695adf4b8d4782f88 100644 (file)
--- a/test/data/headers.php
+++ b/test/data/headers.php
@@ -6,15 +6,11 @@ $headers = array();
 
 foreach( $_SERVER as $key => $value ) {
 
-       if ( substr( $key , 0 , 5 ) == "HTTP_" ) {
-
-               $key = str_replace( "_" , "-" , substr( $key , 5) );
-               $headers[ $key ] = $value;
-
-       }
+       $key = str_replace( "_" , "-" , substr( $key , 0 , 5 ) == "HTTP_" ? substr( $key , 5 ) : $key );
+       $headers[ $key ] = $value;
 
 }
 
 foreach( explode( "_" , $_GET[ "keys" ] ) as $key ) {
-       echo "$key: " . $headers[ strtoupper( $key ) ] . "\n";
+       echo "$key: " . @$headers[ strtoupper( $key ) ] . "\n";
 }

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 9713506ad07bd8ef3809c7a9d426c96fa686acfa..d5f2bc0cf09a9f5e3c5b656ba620b8446afefc58 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -276,6 +276,42 @@ test(".ajax() - headers" , function() {
 
 });
 
+test(".ajax() - contentType" , function() {
+
+       expect( 2 );
+
+       stop();
+
+       var count = 2;
+
+       function restart() {
+               if ( ! --count ) {
+                       start();
+               }
+       }
+
+       jQuery.ajax(url("data/headers.php?keys=content-type" ), {
+               contentType: "test",
+               success: function( data ) {
+                       strictEqual( data , "content-type: test\n" , "Test content-type is sent when options.contentType is set" );
+               },
+               complete: function() {
+                       restart();
+               }
+       });
+
+       jQuery.ajax(url("data/headers.php?keys=content-type" ), {
+               contentType: false,
+               success: function( data ) {
+                       strictEqual( data , "content-type: \n" , "Test content-type is not sent when options.contentType===false" );
+               },
+               complete: function() {
+                       restart();
+               }
+       });
+
+});
+
 test(".ajax() - hash", function() {
        expect(3);