X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=d9b3a3d8b4d01d808cac67a9a6d81026606610e3;hb=e112e6b04d1736d3a847d44b96f7178175e17a15;hp=4f0b2e8fdd44e3abc38b3c07d19628cd620528f2;hpb=8cf5d2df19d918bb84f4c59bc4346c215fbfaf88;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 4f0b2e8..d9b3a3d 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -434,7 +434,7 @@ jQuery.extend({
 	 * @cat Ajax
 	 */
 	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
+		jQuery.extend( true, jQuery.ajaxSettings, settings );
 	},
 
 	ajaxSettings: {
@@ -575,7 +575,7 @@ jQuery.extend({
 	ajax: function( s ) {
 		// Extend the settings, but re-extend 's' so that it can be
 		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(s, jQuery.extend({}, jQuery.ajaxSettings, s));
+		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
 
 		// if data available
 		if ( s.data ) {