Skip to content
Permalink
Browse files

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

… data serialization.
  • Loading branch information...
jaubourg committed Jan 9, 2011
1 parent 62a1a1a commit 8c8bd3bf6ac982f98c1b89b0af74a1fd2d07e360
Showing with 18 additions and 2 deletions.
  1. +1 −1 src/ajax/jsonp.js
  2. +17 −1 test/unit/ajax.js
@@ -1,7 +1,7 @@
(function( jQuery ) {

var jsc = jQuery.now(),
jsre = /\=\?(&|$)/,
jsre = /\=(?:\?|%3F)(&|$)/i,
rquery_jsonp = /\?/;

// Default jsonp settings
@@ -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(); }
@@ -1128,6 +1128,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",

0 comments on commit 8c8bd3b

Please sign in to comment.
You can’t perform that action at this time.