deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow the user to explicitly set a content-type header even when there's no data being sent to the server. Fixes #1900.

Browse source
This commit is contained in:
John Resig 2009-12-04 21:20:58 -05:00
parent d684122be0
commit 25b0ba9f96
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ajax.js
View file

@ -195,10 +195,8 @@ jQuery.extend({
lastModified: {}, lastModified: {},
etag: {}, etag: {},
ajax: function( s ) { ajax: function( origSettings ) {
// Extend the settings, but re-extend 's' so that it can be var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
// checked again later (in the test suite, specifically)
s = jQuery.extend(true, {}, jQuery.ajaxSettings, s);
var jsonp, status, data, var jsonp, status, data,
callbackContext = s.context || window, callbackContext = s.context || window,
@ -333,7 +331,7 @@ jQuery.extend({
// Need an extra try/catch for cross domain requests in Firefox 3 // Need an extra try/catch for cross domain requests in Firefox 3
try { try {
// Set the correct header, if data is being sent // Set the correct header, if data is being sent
if ( s.data ) { if ( s.data || origSettings.contentType ) {
xhr.setRequestHeader("Content-Type", s.contentType); xhr.setRequestHeader("Content-Type", s.contentType);
} }