Skip to content

Commit

Permalink
Don't try and convert data for 204 No Content responses. Fixes #13292…
Browse files Browse the repository at this point in the history
…. Fixes #13261.
  • Loading branch information
byroot authored and jaubourg committed Jan 24, 2013
1 parent 21af3a9 commit eb47553
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/ajax.js
Expand Up @@ -624,12 +624,17 @@ jQuery.extend({
} }
} }


// If not modified // if no content
if ( status === 304 ) { if ( status === 204 ) {
isSuccess = true;
statusText = "nocontent";

// if not modified
} else if ( status === 304 ) {
isSuccess = true; isSuccess = true;
statusText = "notmodified"; statusText = "notmodified";


// If we have data // If we have data, let's convert it
} else { } else {
isSuccess = ajaxConvert( s, response ); isSuccess = ajaxConvert( s, response );
statusText = isSuccess.state; statusText = isSuccess.state;
Expand Down
5 changes: 5 additions & 0 deletions test/data/nocontent.php
@@ -0,0 +1,5 @@
<?php

header('HTTP/1.0 204 No Content');

?>
20 changes: 20 additions & 0 deletions test/unit/ajax.js
Expand Up @@ -1498,6 +1498,26 @@ module( "ajax", {
strictEqual( ajaxXML.find("tab").length, 3, "Parsed node was added properly" ); strictEqual( ajaxXML.find("tab").length, 3, "Parsed node was added properly" );
} }
}); });

ajaxTest( "#13292 - jQuery.ajax() - converter is bypassed for 204 requests", 3, {
url: "data/nocontent.php",
dataType: "testing",
converters: {
"* testing": function() {
throw "converter was called";
}
},
success: function( data, status, jqXHR ) {
strictEqual( jqXHR.status, 204, "status code is 204" );
strictEqual( status, "nocontent", "status text is 'nocontent'" );
strictEqual( data, undefined, "data is undefined" );
},
error: function( _, status, error ) {
ok( false, "error" );
strictEqual( status, "parsererror", "Parser Error" );
strictEqual( error, "converter was called", "Converter was called" );
}
});


//----------- jQuery.ajaxPrefilter() //----------- jQuery.ajaxPrefilter()


Expand Down

0 comments on commit eb47553

Please sign in to comment.