Permalink
Browse files

Fix memory leaks in IE caused by the custom abort function of $.ajax.…

… Fixes bug #6242.
  • Loading branch information...
1 parent e1d6edf commit 238ac5a0aa25e7fb4fead7a56b92951817446127 @csnover csnover committed Dec 3, 2010
Showing with 13 additions and 6 deletions.
  1. +13 −6 src/ajax.js
View
@@ -195,6 +195,17 @@ 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);
@@ -403,13 +414,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" :
@@ -451,10 +461,7 @@ jQuery.extend({
xhr.abort();
}
- // Stop memory leaks
- if ( s.async ) {
- xhr = null;
- }
+ cleanup();
}
};

0 comments on commit 238ac5a

Please sign in to comment.