Added support for 307 redirects

Fix a potential lock issue with redirected requests

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.5-41 2010-02-03";
+NSString *ASIHTTPRequestVersion = @"v1.5-42 2010-02-03";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -1069,11 +1069,13 @@ static BOOL isiPhoneOS2;
 		// Some naughty / badly coded website is trying to force us into a redirection loop. This is not cool.
 		// Some naughty / badly coded website is trying to force us into a redirection loop. This is not cool.
 		[self failWithError:ASITooMuchRedirectionError];
 		[self failWithError:ASITooMuchRedirectionError];
 		[self setComplete:YES];
 		[self setComplete:YES];
+		[[self cancelledLock] unlock];
 	} else {
 	} else {
+		[[self cancelledLock] unlock];
+		
 		// Go all the way back to the beginning and build the request again, so that we can apply any new cookies
 		// Go all the way back to the beginning and build the request again, so that we can apply any new cookies
 		[self main];
 		[self main];
 	}
 	}
-	[[self cancelledLock] unlock];
 }
 }
 
 
 // This gets fired every 1/4 of a second to update the progress and work out if we need to timeout
 // This gets fired every 1/4 of a second to update the progress and work out if we need to timeout
@@ -1724,16 +1726,16 @@ static BOOL isiPhoneOS2;
 				}
 				}
 			}
 			}
 			// Do we need to redirect?
 			// Do we need to redirect?
-			// Note that ASIHTTPRequest does not currently support 305 Use Proxy or 307 Temporary Redirect
+			// Note that ASIHTTPRequest does not currently support 305 Use Proxy
 			if ([self shouldRedirect] && [responseHeaders valueForKey:@"Location"]) {
 			if ([self shouldRedirect] && [responseHeaders valueForKey:@"Location"]) {
-				if ([self responseStatusCode] > 300 && [self responseStatusCode] < 304) {
+				if (([self responseStatusCode] > 300 && [self responseStatusCode] < 304) || [self responseStatusCode] == 307) {
 					
 					
 					// By default, we redirect 301 and 302 response codes as GET requests
 					// By default, we redirect 301 and 302 response codes as GET requests
 					// According to RFC 2616 this is wrong, but this is what most browsers do, so it's probably what you're expecting to happen
 					// According to RFC 2616 this is wrong, but this is what most browsers do, so it's probably what you're expecting to happen
 					// See also:
 					// See also:
 					// http://allseeing-i.lighthouseapp.com/projects/27881/tickets/27-302-redirection-issue
 					// http://allseeing-i.lighthouseapp.com/projects/27881/tickets/27-302-redirection-issue
 									
 									
-					if (![self shouldUseRFC2616RedirectBehaviour] || [self responseStatusCode] == 303) {
+					if ([self responseStatusCode] != 307 && (![self shouldUseRFC2616RedirectBehaviour] || [self responseStatusCode] == 303)) {
 						[self setRequestMethod:@"GET"];
 						[self setRequestMethod:@"GET"];
 						[self setPostBody:nil];
 						[self setPostBody:nil];
 						[self setPostLength:0];
 						[self setPostLength:0];

@@ -323,7 +323,11 @@
 	ASIFormDataRequest *request2;
 	ASIFormDataRequest *request2;
 	BOOL success;
 	BOOL success;
 	unsigned int i;
 	unsigned int i;
-	for (i=301; i<305; i++) {
+	for (i=301; i<308; i++) {
+		
+		if (i > 304 && i < 307) {
+			continue;
+		}
 		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://allseeing-i.com/ASIHTTPRequest/tests/redirect/%hi",i]];
 		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://allseeing-i.com/ASIHTTPRequest/tests/redirect/%hi",i]];
 		request = [ASIHTTPRequest requestWithURL:url];
 		request = [ASIHTTPRequest requestWithURL:url];
 		[request setShouldRedirect:NO];
 		[request setShouldRedirect:NO];
@@ -340,10 +344,14 @@
 		
 		
 		NSString *method = @"GET";
 		NSString *method = @"GET";
 		if (i>304) {
 		if (i>304) {
-			method = @"POST";
+			method = @"POST";	
 		}
 		}
-		
-		success = [[request2 responseString] isEqualToString:[NSString stringWithFormat:@"Redirected as %@ after a %hi status code",method,i]];
+		NSString *expectedString = [NSString stringWithFormat:@"Redirected as %@ after a %hi status code",method,i];
+		if (i>304) {
+			expectedString = [NSString stringWithFormat:@"%@\r\nWatch out for the Giant Monkey!",expectedString];
+		}
+
+		success = [[request2 responseString] isEqualToString:expectedString];
 		GHAssertTrue(success,[NSString stringWithFormat:@"Got the wrong content when redirecting after a %hi",i]);
 		GHAssertTrue(success,[NSString stringWithFormat:@"Got the wrong content when redirecting after a %hi",i]);
 	
 	
 		success = ([request2 responseStatusCode] == 200);
 		success = ([request2 responseStatusCode] == 200);
@@ -353,6 +361,7 @@
 	
 	
 	// Test RFC 2616 behaviour
 	// Test RFC 2616 behaviour
 	for (i=301; i<303; i++) {
 	for (i=301; i<303; i++) {
+		
 		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://allseeing-i.com/ASIHTTPRequest/tests/redirect/%hi",i]];
 		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://allseeing-i.com/ASIHTTPRequest/tests/redirect/%hi",i]];
 		request2 = [ASIFormDataRequest requestWithURL:url];
 		request2 = [ASIFormDataRequest requestWithURL:url];
 		[request2 setPostValue:@"Giant Monkey" forKey:@"lookbehindyou"];
 		[request2 setPostValue:@"Giant Monkey" forKey:@"lookbehindyou"];