Merge branch 'master' into concurrent

Conflicts:
	Classes/ASIHTTPRequest.m

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.2-44 2009-12-18";
+NSString *ASIHTTPRequestVersion = @"v1.2-45 2009-12-18";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -519,7 +519,6 @@ static BOOL isiPhoneOS2;
 		} else {
 		} else {
 			[self willChangeValueForKey:@"isExecuting"];
 			[self willChangeValueForKey:@"isExecuting"];
 			[self didChangeValueForKey:@"isExecuting"];
 			[self didChangeValueForKey:@"isExecuting"];
-			
 
 
 			[self main];
 			[self main];
 
 
@@ -558,6 +557,12 @@ static BOOL isiPhoneOS2;
 {
 {
 	[self setComplete:NO];
 	[self setComplete:NO];
 	
 	
+	// A HEAD request generated by an ASINetworkQueue may have set the error already. If so, we should not proceed.
+	if ([self error]) {
+		[self failWithError:nil];
+		return;		
+	}
+	
 	if (![self url]) {
 	if (![self url]) {
 		[self failWithError:ASIUnableToCreateRequestError];
 		[self failWithError:ASIUnableToCreateRequestError];
 		return;		
 		return;		
@@ -1405,28 +1410,23 @@ static BOOL isiPhoneOS2;
 		return;
 		return;
 	}
 	}
 	
 	
+	ASIHTTPRequest *failedRequest = self;
+	
 	// If this is a HEAD request created by an ASINetworkQueue or compatible queue delegate, make the main request fail
 	// If this is a HEAD request created by an ASINetworkQueue or compatible queue delegate, make the main request fail
 	if ([self mainRequest]) {
 	if ([self mainRequest]) {
-		ASIHTTPRequest *mRequest = [self mainRequest];
-		[mRequest setError:theError];
-
-		// Let the queue know something went wrong
-		if ([[self queue] respondsToSelector:@selector(requestDidFail:)]) {
-			[[self queue] performSelectorOnMainThread:@selector(requestDidFail:) withObject:mRequest waitUntilDone:[NSThread isMainThread]];		
-		}
+		failedRequest = [self mainRequest];
+	}
 	
 	
-	} else {
-		[self setError:theError];
-		
-		// Let the queue know something went wrong
-		if ([[self queue] respondsToSelector:@selector(requestDidFail:)]) {
-			[[self queue] performSelectorOnMainThread:@selector(requestDidFail:) withObject:self waitUntilDone:[NSThread isMainThread]];		
-		}
+	[failedRequest setError:theError];
+
+	// Let the queue know something went wrong
+	if ([[failedRequest queue] respondsToSelector:@selector(requestDidFail:)]) {
+		[[failedRequest queue] performSelectorOnMainThread:@selector(requestDidFail:) withObject:failedRequest waitUntilDone:[NSThread isMainThread]];		
+	}
 		
 		
-		// Let the delegate know something went wrong
-		if ([self didFailSelector] && [[self delegate] respondsToSelector:[self didFailSelector]]) {
-			[[self delegate] performSelectorOnMainThread:[self didFailSelector] withObject:self waitUntilDone:[NSThread isMainThread]];	
-		}
+	// Let the delegate know something went wrong
+	if ([failedRequest didFailSelector] && [[failedRequest delegate] respondsToSelector:[failedRequest didFailSelector]]) {
+		[[failedRequest delegate] performSelectorOnMainThread:[failedRequest didFailSelector] withObject:failedRequest waitUntilDone:[NSThread isMainThread]];	
 	}
 	}
 }
 }
 
 

@@ -46,6 +46,7 @@ IMPORTANT
 	BOOL started;
 	BOOL started;
 	BOOL finished;
 	BOOL finished;
 	BOOL failed;
 	BOOL failed;
+	BOOL headFailed;
 }
 }
 - (void)testBackgroundThreadedRequests;
 - (void)testBackgroundThreadedRequests;
 - (void)testFailure;
 - (void)testFailure;
@@ -67,7 +68,7 @@ IMPORTANT
 
 
 - (void)testDelegateAuthenticationCredentialsReuse;
 - (void)testDelegateAuthenticationCredentialsReuse;
 - (void)testPOSTWithAuthentication;
 - (void)testPOSTWithAuthentication;
-
+- (void)testHEADFailure;
 @property (retain) NSOperationQueue *immediateCancelQueue;
 @property (retain) NSOperationQueue *immediateCancelQueue;
 @property (retain) NSMutableArray *failedRequests;
 @property (retain) NSMutableArray *failedRequests;
 @property (retain) NSMutableArray *finishedRequests;
 @property (retain) NSMutableArray *finishedRequests;

@@ -1104,6 +1104,33 @@ IMPORTANT
 	GHAssertTrue(success,@"Failed to send credentials correctly? (Expected: '%@', got '%@')",expectedResponse,[[request responseString] lowercaseString]);
 	GHAssertTrue(success,@"Failed to send credentials correctly? (Expected: '%@', got '%@')",expectedResponse,[[request responseString] lowercaseString]);
 }
 }
 
 
+// Test for a bug where failing head requests would not notify the original request's delegate of the failure
+- (void)testHEADFailure
+{
+	headFailed = NO;
+	ASINetworkQueue *queue = [ASINetworkQueue queue];
+	[queue setShowAccurateProgress:YES];
+	
+	[queue setDelegate:self];
+	ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://999.123"]];
+	[request setDelegate:self];
+	[request setDidFailSelector:@selector(HEADFail:)];
+	[queue addOperation:request];
+	[queue go];
+	
+	[queue waitUntilAllOperationsAreFinished];
+	
+	// Hope the request gets around to notifying the delegate in time
+	[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:2]];
+	
+	GHAssertTrue(headFailed,@"Failed to notify the request's delegate");
+}
+
+- (void)HEADFail:(ASIHTTPRequest *)request
+{
+	headFailed = YES;	
+}
+
 @synthesize immediateCancelQueue;
 @synthesize immediateCancelQueue;
 @synthesize failedRequests;
 @synthesize failedRequests;
 @synthesize finishedRequests;
 @synthesize finishedRequests;