Only invalidate+release the old status timer when the new one is scheduled - pre…

…vents a crash for async requests when only the timer is retaining the request

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.2-65 2010-01-05";
+NSString *ASIHTTPRequestVersion = @"v1.2-66 2010-01-05";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -1021,7 +1021,7 @@ static BOOL isiPhoneOS2;
 	// Record when the request started, so we can timeout if nothing happens
 	// Record when the request started, so we can timeout if nothing happens
 	[self setLastActivityTime:[NSDate date]];	
 	[self setLastActivityTime:[NSDate date]];	
 	
 	
-	[[self statusTimer] invalidate];
+
 	[self setStatusTimer:[NSTimer scheduledTimerWithTimeInterval:0.25 target:self selector:@selector(updateStatus:) userInfo:nil repeats:YES]];
 	[self setStatusTimer:[NSTimer scheduledTimerWithTimeInterval:0.25 target:self selector:@selector(updateStatus:) userInfo:nil repeats:YES]];
 	
 	
 	// If we're running asynchronously on the main thread, the runloop will already be running and we can return control
 	// If we're running asynchronously on the main thread, the runloop will already be running and we can return control
@@ -1032,6 +1032,17 @@ static BOOL isiPhoneOS2;
 	}
 	}
 }
 }
 
 
+- (void)setStatusTimer:(NSTimer *)timer
+{
+	// We must invalidate the old timer here, not before we've created and scheduled a new timer
+	// This is because the timer may be the only thing retaining an asynchronous request
+	if (timer != [self statusTimer]) {
+		[[self statusTimer] invalidate];
+		[[self statusTimer] release];
+	}
+	statusTimer = [timer retain];
+}
+
 - (void)performRedirect
 - (void)performRedirect
 {
 {
 	[[self cancelledLock] lock];
 	[[self cancelledLock] lock];
@@ -1055,8 +1066,7 @@ static BOOL isiPhoneOS2;
 - (void)updateStatus:(NSTimer*)timer
 - (void)updateStatus:(NSTimer*)timer
 {	
 {	
 	[self checkRequestStatus];
 	[self checkRequestStatus];
-	if ([self complete] || [self error]) {
-		[timer invalidate];
+	if (![self inProgress]) {
 		[self setStatusTimer:nil];
 		[self setStatusTimer:nil];
 		CFRunLoopStop(CFRunLoopGetCurrent());
 		CFRunLoopStop(CFRunLoopGetCurrent());
 	}
 	}