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

…. Fixes #13261.
jquery · Jan 24, 2013 · bfc61b879e9e94ef7c6b31919b7f287ffdf180a8 · bfc61b8 · gibson042 · Jan 25, 2013
1 parent caac041
commit bfc61b879e9e94ef7c6b31919b7f287ffdf180a8
Unified Split

Showing with 33 additions and 3 deletions.

+8 −3 src/ajax.js

+5 −0 test/data/nocontent.php

+20 −0 test/unit/ajax.js
diff --git a/src/ajax.js b/src/ajax.js
@@ -624,12 +624,17 @@ jQuery.extend({
 					}
 				}
-  
-				// If not modified
-  
-				if ( status === 304 ) {
+  
+				// if no content
+  
+				if ( status === 204 ) {
+  
+					isSuccess = true;
+  
+					statusText = "nocontent";
+  
+
+  
+				// if not modified
+  
+				} else if ( status === 304 ) {
 					isSuccess = true;
 					statusText = "notmodified";
-  
-				// If we have data
+  
+				// If we have data, let's convert it
 				} else {
 					isSuccess = ajaxConvert( s, response );
 					statusText = isSuccess.state;
diff --git a/test/data/nocontent.php b/test/data/nocontent.php
@@ -0,0 +1,5 @@
+  
+<?php
+  
+
+  
+header('HTTP/1.0 204 No Content');
+  
+
+  
+?>
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -1456,6 +1456,26 @@ module( "ajax", {
 			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()