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

…jquery#3874.
Karunakar · Jan 21, 2009 · 00b70c7 · 00b70c7
1 parent db10da3
commit 00b70c7
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/ajax.js b/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);
 		}