Ajax: Execute JSONP error script responses

fras2560 · web-flow · commit a1e619b03a55 · 2020-08-25T21:41:06.000+02:00
Issue gh-4379 was meant to be a bug fix but the JSONP case is a bit special: under the hood it's a script but it simulates JSON responses in an environment without a CORS setup and sending JSON payloads on error responses is quite typical there. This commit makes JSONP error responses still execute the payload. The regular script error responses continue to be skipped. Fixes gh-4771 Closes gh-4773
diff --git a/src/ajax.js b/src/ajax.js
@@ -746,8 +746,10 @@ jQuery.extend( {
 				response = ajaxHandleResponses( s, jqXHR, responses );
 			}
 
-			// Use a noop converter for missing script
-			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+			// Use a noop converter for missing script but not if jsonp
+			if ( !isSuccess &&
+				jQuery.inArray( "script", s.dataTypes ) > -1 &&
+				jQuery.inArray( "json", s.dataTypes ) < 0 ) {
 				s.converters[ "text script" ] = function() {};
 			}
 
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -810,6 +810,19 @@ QUnit.module( "ajax", {
 		};
 	} );
 
+	ajaxTest( "jQuery.ajax() - do execute scripts if JSONP from unsuccessful responses", 1, function( assert ) {
+		var testMsg = "Unsuccessful JSONP requests should have a JSON body";
+		return {
+			dataType: "jsonp",
+			url: url( "mock.php?action=errorWithScript" ),
+			// error is the significant assertion
+			error: function( xhr ) {
+				var expected = { "status": 404, "msg": "Not Found" };
+				assert.deepEqual( xhr.responseJSON, expected, testMsg );
+			}
+		};
+	} );
+
 	ajaxTest( "jQuery.ajax() - do not execute scripts from unsuccessful responses (gh-4250)", 11, function( assert ) {
 		var globalEval = jQuery.globalEval;
 

Original file line number	Diff line number	Diff line change
`@@ -746,8 +746,10 @@ jQuery.extend( {`
`746`	`746`	`response = ajaxHandleResponses( s, jqXHR, responses );`
`747`	`747`	`}`
`748`	`748`
`749`		`- // Use a noop converter for missing script`
`750`		`- if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {`
	`749`	`+ // Use a noop converter for missing script but not if jsonp`
	`750`	`+ if ( !isSuccess &&`
	`751`	`+ jQuery.inArray( "script", s.dataTypes ) > -1 &&`
	`752`	`+ jQuery.inArray( "json", s.dataTypes ) < 0 ) {`
`751`	`753`	`s.converters[ "text script" ] = function() {};`
`752`	`754`	`}`
`753`	`755`