Browse files

Landed a fix for timeouts not being aborted properly. Fixes jQuery bu…

…g #3874.
  • Loading branch information...
1 parent db10da3 commit 00b70c75278896495365e25f0327af4a1b61acce @jeresig jeresig committed Jan 21, 2009
Showing with 5 additions and 8 deletions.
  1. +5 −8 src/ajax.js
View
13 src/ajax.js
@@ -380,6 +380,9 @@ jQuery.extend({
// Fire the complete handlers
complete();
+ if ( isTimeout )
+ xhr.abort();
+
// Stop memory leaks
if ( s.async )
xhr = null;
@@ -394,14 +397,8 @@ jQuery.extend({
if ( s.timeout > 0 )
setTimeout(function(){
// Check to see if the request is still happening
- if ( xhr ) {
- if( !requestDone )
- onreadystatechange( "timeout" );
-
- // Cancel the request
- if ( xhr )
- xhr.abort();
- }
+ if ( xhr && !requestDone )
+ onreadystatechange( "timeout" );
}, s.timeout);
}

0 comments on commit 00b70c7

Please sign in to comment.