library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't try and convert data for 204 No Content responses. Fixes #13292. Fixes #13261.

Browse Source
This commit is contained in:
byroot 2013-01-24 02:33:17 +01:00 committed by jaubourg
parent 21af3a9213
commit eb47553eea
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ajax.js
View File

@ -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;

5
test/data/nocontent.php Normal file
View File

@ -0,0 +1,5 @@
<?php
header('HTTP/1.0 204 No Content');
?>

20
test/unit/ajax.js
View File

@ -1499,6 +1499,26 @@ module( "ajax", {
} }
}); });
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()
ajaxTest( "jQuery.ajaxPrefilter() - abort", 1, { ajaxTest( "jQuery.ajaxPrefilter() - abort", 1, {