From: John Resig Date: Mon, 6 Dec 2010 22:23:08 +0000 (-0500) Subject: Merge branch 'bug6242' of https://github.com/csnover/jquery into csnover-bug6242 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=9759e9f6bb9b85a95e0254e6b7b2ed861aee8c84;hp=-c;p=jquery.git Merge branch 'bug6242' of https://github.com/csnover/jquery into csnover-bug6242 --- 9759e9f6bb9b85a95e0254e6b7b2ed861aee8c84 diff --combined src/ajax.js index d20ad76,6ea61eb..90dc350 --- a/src/ajax.js +++ b/src/ajax.js @@@ -195,13 -195,21 +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); - s.url = s.url.replace( rhash, "" ); + // 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).replace( rhash, "" ); // Use original (not extended) context object if it was provided s.context = origSettings && origSettings.context != null ? origSettings.context : s; @@@ -264,7 -272,7 +275,7 @@@ }; } - if ( s.dataType === "script" && s.cache === null ) { + if ( s.dataType === "script" && s.cache === undefined ) { s.cache = false; } @@@ -406,13 -414,12 +417,12 @@@ 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 -461,7 +464,7 @@@ xhr.abort(); } - // Stop memory leaks - if ( s.async ) { - xhr = null; - } + cleanup(); } };