Fixes #5812. =? will be detected even when it has been escaped during data serialization.

2 files changed, 18 insertions, 2 deletions

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 0af00567c..f4b324e17 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var jsc = jQuery.now(),
-	jsre = /\=\?(&|$)/,
+	jsre = /\=(?:\?|%3F)(&|$)/i,
 	rquery_jsonp = /\?/;
 
 // Default jsonp settings
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index d849cff24..773088fc9 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1081,7 +1081,7 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
-	expect(9);
+	expect(10);
 
 	var count = 0;
 	function plus(){ if ( ++count == 9 ) start(); }
@@ -1131,6 +1131,22 @@ test("jQuery.ajax() - JSONP, Local", function() {
 	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",
+		data: {
+			callback: "?"
+		},
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, processed data callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, processed data callback)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
 		jsonp: "callback",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, data obj callback)" );