X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=90dc350fc922b6cf0e4dfab15da4d1e53a213ad2;hb=9759e9f6bb9b85a95e0254e6b7b2ed861aee8c84;hp=61b9c438efa1185dfb8f22efd79379afe7aa1efd;hpb=2a0c7d702b83a6b2e40eb79a5d6ea94d74f3090d;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 61b9c43..90dc350 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -195,13 +195,24 @@ jQuery.extend({
 	},
 
 	ajax: function( origSettings ) {
+		// IE8 leaks a lot when we've set abort, and IE6-8 a little
+		// when we have set onreadystatechange. Bug #6242
+		// XXX IE7 still leaks when abort is called, no matter what
+		// we do
+		function cleanup() {
+			// IE6 will throw an error setting xhr.abort
+			try {
+				xhr.abort = xhr.onreadystatechange = jQuery.noop;
+			} catch(e) {}
+		}
+
 		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
 			jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
 
 		// toString fixes people passing a window.location or
 		// document.location to $.ajax, which worked in 1.4.2 and
 		// earlier (bug #7531). It should be removed in 1.5.
-		s.url = s.url.toString().replace( rhash, "" );
+		s.url = ("" + s.url).replace( rhash, "" );
 
 		// Use original (not extended) context object if it was provided
 		s.context = origSettings && origSettings.context != null ? origSettings.context : s;
@@ -264,7 +275,7 @@ jQuery.extend({
 			};
 		}
 
-		if ( s.dataType === "script" && s.cache === null ) {
+		if ( s.dataType === "script" && s.cache === undefined ) {
 			s.cache = false;
 		}
 
@@ -406,13 +417,12 @@ jQuery.extend({
 
 				requestDone = true;
 				if ( xhr ) {
-					xhr.onreadystatechange = jQuery.noop;
+					cleanup();
 				}
 
 			// The transfer is complete and the data is available, or the request timed out
 			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
 				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
 
 				status = isTimeout === "timeout" ?
 					"timeout" :
@@ -454,10 +464,7 @@ jQuery.extend({
 					xhr.abort();
 				}
 
-				// Stop memory leaks
-				if ( s.async ) {
-					xhr = null;
-				}
+				cleanup();
 			}
 		};