Fix cancelling for requests that redirect

@@ -366,6 +366,9 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
 	// When set to YES, 301 and 302 automatic redirects will use the original method and and body, according to the HTTP 1.1 standard
 	// When set to YES, 301 and 302 automatic redirects will use the original method and and body, according to the HTTP 1.1 standard
 	// Default is NO (to follow the behaviour of most browsers)
 	// Default is NO (to follow the behaviour of most browsers)
 	BOOL shouldUseRFC2616RedirectBehaviour;
 	BOOL shouldUseRFC2616RedirectBehaviour;
+	
+	// Used internally to record when a request has finished downloading data
+	BOOL downloadComplete;
 }
 }
 
 
 #pragma mark init / dealloc
 #pragma mark init / dealloc

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.5-44 2010-02-04";
+NSString *ASIHTTPRequestVersion = @"v1.5-45 2010-02-10";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -181,6 +181,7 @@ static BOOL isiPhoneOS2;
 @property (assign) ASIAuthenticationState authenticationNeeded;
 @property (assign) ASIAuthenticationState authenticationNeeded;
 @property (assign, nonatomic) BOOL readStreamIsScheduled;
 @property (assign, nonatomic) BOOL readStreamIsScheduled;
 @property (retain, nonatomic) NSTimer *statusTimer;
 @property (retain, nonatomic) NSTimer *statusTimer;
+@property (assign, nonatomic) BOOL downloadComplete;
 @end
 @end
 
 
 
 
@@ -768,6 +769,7 @@ static BOOL isiPhoneOS2;
 	
 	
 	[self requestStarted];
 	[self requestStarted];
 	
 	
+	[self setDownloadComplete:NO];
 	[self setComplete:NO];
 	[self setComplete:NO];
 	[self setTotalBytesRead:0];
 	[self setTotalBytesRead:0];
 	[self setLastBytesRead:0];
 	[self setLastBytesRead:0];
@@ -2403,7 +2405,15 @@ static BOOL isiPhoneOS2;
 	
 	
 	[[self cancelledLock] unlock];
 	[[self cancelledLock] unlock];
 	
 	
-	if (![self inProgress]) {
+	if ([self downloadComplete] && [self needsRedirect]) {
+		CFRunLoopStop(CFRunLoopGetCurrent());
+		[self performRedirect];
+		return;
+	} else if ([self downloadComplete] && [self authenticationNeeded]) {
+		CFRunLoopStop(CFRunLoopGetCurrent());
+		[self attemptToApplyCredentialsAndResume];
+		return;
+	} else if (![self inProgress]) {
 		[self setStatusTimer:nil];
 		[self setStatusTimer:nil];
 	}
 	}
 	
 	
@@ -2497,6 +2507,8 @@ static BOOL isiPhoneOS2;
 	NSLog(@"Request %@ finished downloading data",self);
 	NSLog(@"Request %@ finished downloading data",self);
 #endif
 #endif
 	
 	
+	[self setDownloadComplete:YES];
+	
 	if (![self responseHeaders]) {
 	if (![self responseHeaders]) {
 		[self readResponseHeaders];
 		[self readResponseHeaders];
 	}
 	}
@@ -2528,7 +2540,6 @@ static BOOL isiPhoneOS2;
 			if (decompressionStatus != Z_OK) {
 			if (decompressionStatus != Z_OK) {
 				fileError = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed with code %hi",[self temporaryFileDownloadPath],decompressionStatus],NSLocalizedDescriptionKey,nil]];
 				fileError = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASIFileManagementError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed with code %hi",[self temporaryFileDownloadPath],decompressionStatus],NSLocalizedDescriptionKey,nil]];
 			}
 			}
-				
 			[self removeTemporaryDownloadFile];
 			[self removeTemporaryDownloadFile];
 		} else {
 		} else {
 					
 					
@@ -2549,6 +2560,7 @@ static BOOL isiPhoneOS2;
 				}
 				}
 				[self setTemporaryFileDownloadPath:nil];
 				[self setTemporaryFileDownloadPath:nil];
 			}
 			}
+			
 		}
 		}
 	}
 	}
 	[progressLock unlock];
 	[progressLock unlock];
@@ -2565,27 +2577,20 @@ static BOOL isiPhoneOS2;
 	[[self connectionInfo] setObject:[NSDate dateWithTimeIntervalSinceNow:closeStreamTime] forKey:@"expires"];
 	[[self connectionInfo] setObject:[NSDate dateWithTimeIntervalSinceNow:closeStreamTime] forKey:@"expires"];
 	[connectionsLock unlock];
 	[connectionsLock unlock];
 	
 	
-	if ([self needsRedirect]) {
-		CFRunLoopStop(CFRunLoopGetCurrent());
-		[self performRedirect];
-		return;
-	} else if ([self authenticationNeeded]) {
-		CFRunLoopStop(CFRunLoopGetCurrent());
-		[self attemptToApplyCredentialsAndResume];
-		return;
-	}
-	
-	if (fileError) {
-		[self failWithError:fileError];
-	} else {
-		[self requestFinished];
-	}
-
 	if (![self authenticationNeeded]) {
 	if (![self authenticationNeeded]) {
 		[self destroyReadStream];
 		[self destroyReadStream];
 	}
 	}
 	
 	
-	[self markAsFinished];
+	if (![self needsRedirect] && ![self authenticationNeeded]) {
+		
+		if (fileError) {
+			[self failWithError:fileError];
+		} else {
+			[self requestFinished];
+		}
+
+		[self markAsFinished];
+	}
 }
 }
 
 
 - (void)markAsFinished
 - (void)markAsFinished
@@ -3720,4 +3725,5 @@ static BOOL isiPhoneOS2;
 @synthesize readStreamIsScheduled;
 @synthesize readStreamIsScheduled;
 @synthesize statusTimer;
 @synthesize statusTimer;
 @synthesize shouldUseRFC2616RedirectBehaviour;
 @synthesize shouldUseRFC2616RedirectBehaviour;
+@synthesize downloadComplete;
 @end
 @end

@@ -78,8 +78,29 @@
 	[request startAsynchronous];
 	[request startAsynchronous];
 	[request cancel];
 	[request cancel];
 	GHAssertNotNil([request error],@"Failed to cancel the request");
 	GHAssertNotNil([request error],@"Failed to cancel the request");
+	
+	// Test cancelling a redirected request works
+	// This test is probably unreliable on very slow or very fast connections, as it depends on being able to complete the first request (but not the second) in under 2 seconds
+	request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/cancel_redirect"]];
+	[request startAsynchronous];
+	
+	[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:2.0]];
+	[request cancel];
+	
+	BOOL success = ([[[request url] absoluteString] isEqualToString:@"http://allseeing-i.com/ASIHTTPRequest/tests/the_great_american_novel.txt"]);
+
+	GHAssertTrue(success, @"Request did not redirect quickly enough, cannot proceed with test");
+	
+	GHAssertNotNil([request error],@"Failed to cancel the request");	 
+	
+	success = [request totalBytesRead] < 7900198;
+	GHAssertTrue(success, @"Downloaded the whole of the response even though we should have cancelled by now");
+	
+
 }
 }
 
 
+
+
 - (void)testDelegateMethods
 - (void)testDelegateMethods
 {
 {
 	// We run this test on the main thread because otherwise we can't depend on the  delegate being notified before we need to test it's working
 	// We run this test on the main thread because otherwise we can't depend on the  delegate being notified before we need to test it's working