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

Ajax: improve content-type detection

Browse Source 
Fixes gh-2584
Closes gh-2643
This commit is contained in:
Oleg Gaidarenko 2015-10-12 19:56:46 +03:00
parent cb087ce41d
commit 239169bb2e
4 changed files with 112 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ajax.js
View File

@ -322,9 +322,9 @@ jQuery.extend( {
},
contents: {
xml: /xml/,
html: /html/,
json: /json/
xml: /\bxml\b/,
html: /\bhtml/,
json: /\bjson\b/
},
responseFields: {

2
src/ajax/script.js
View File

@ -18,7 +18,7 @@ jQuery.ajaxSetup( {
"application/ecmascript, application/x-ecmascript"
},
contents: {
script: /(?:java|ecma)script/
script: /\b(?:java|ecma)script\b/
},
converters: {
"text script": function( text ) {

5
test/data/ajax/content-type.php Normal file
View File

@ -0,0 +1,5 @@
<?php
$type = $_REQUEST['content-type'];
header("Content-type: $type");
echo $_REQUEST['response']
?>

104
test/unit/ajax.js
View File

@ -1794,7 +1794,109 @@ QUnit.module( "ajax", {
}
);
// //----------- jQuery.ajaxPrefilter()
ajaxTest( "gh-2587 - when content-type not xml, but looks like one", 1, function( assert ) {
return {
url: url( "data/ajax/content-type.php" ),
data: {
"content-type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"response": "<test/>"
},
success: function( result ) {
assert.strictEqual(
typeof result,
"string",
"Should handle it as a string, not xml"
);
}
};
} );
ajaxTest( "gh-2587 - when content-type not xml, but looks like one", 1, function( assert ) {
return {
url: url( "data/ajax/content-type.php" ),
data: {
"content-type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"response": "<test/>"
},
success: function( result ) {
assert.strictEqual(
typeof result,
"string",
"Should handle it as a string, not xml"
);
}
};
} );
ajaxTest( "gh-2587 - when content-type not json, but looks like one", 1, function( assert ) {
return {
url: url( "data/ajax/content-type.php" ),
data: {
"content-type": "test/jsontest",
"response": JSON.stringify({test: "test"})
},
success: function( result ) {
assert.strictEqual(
typeof result,
"string",
"Should handle it as a string, not json"
);
}
};
} );
ajaxTest( "gh-2587 - when content-type not html, but looks like one", 1, function( assert ) {
return {
url: url( "data/ajax/content-type.php" ),
data: {
"content-type": "test/htmltest",
"response": "<p>test</p>"
},
success: function( result ) {
assert.strictEqual(
typeof result,
"string",
"Should handle it as a string, not html"
);
}
};
} );
ajaxTest( "gh-2587 - when content-type not javascript, but looks like one", 1, function( assert ) {
return {
url: url( "data/ajax/content-type.php" ),
data: {
"content-type": "test/testjavascript",
"response": "alert(1)"
},
success: function( result ) {
assert.strictEqual(
typeof result,
"string",
"Should handle it as a string, not javascript"
);
}
};
} );
ajaxTest( "gh-2587 - when content-type not ecmascript, but looks like one", 1, function( assert ) {
return {
url: url( "data/ajax/content-type.php" ),
data: {
"content-type": "test/testjavascript",
"response": "alert(1)"
},
success: function( result ) {
assert.strictEqual(
typeof result,
"string",
"Should handle it as a string, not ecmascript"
);
}
};
} );
//----------- jQuery.ajaxPrefilter()
ajaxTest( "jQuery.ajaxPrefilter() - abort", 1, function( assert ) {
return {