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

Landed a fix for timeouts not being aborted properly. Fixes jQuery bug #3874.

Browse source
This commit is contained in:
John Resig 2009-01-21 21:46:53 +00:00
parent db10da345e
commit 00b70c7527
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ajax.js
View file

@ -380,6 +380,9 @@ jQuery.extend({
// Fire the complete handlers // Fire the complete handlers
complete(); complete();
if ( isTimeout )
xhr.abort();
// Stop memory leaks // Stop memory leaks
if ( s.async ) if ( s.async )
xhr = null; xhr = null;
@ -394,14 +397,8 @@ jQuery.extend({
if ( s.timeout > 0 ) if ( s.timeout > 0 )
setTimeout(function(){ setTimeout(function(){
// Check to see if the request is still happening // Check to see if the request is still happening
if ( xhr ) { if ( xhr && !requestDone )
if( !requestDone )
onreadystatechange( "timeout" ); onreadystatechange( "timeout" );
// Cancel the request
if ( xhr )
xhr.abort();
}
}, s.timeout); }, s.timeout);
} }