@@ -436,7 +436,6 @@ static BOOL isiPhoneOS2; // Create the request - (void)main { - [pool release]; pool = [[NSAutoreleasePool alloc] init]; [self setComplete:NO]; @@ -455,7 +454,7 @@ static BOOL isiPhoneOS2; if (request) { CFRelease(request); } - + // Create a new HTTP request. request = CFHTTPMessageCreateRequest(kCFAllocatorDefault, (CFStringRef)[self requestMethod], (CFURLRef)[self url], [self useHTTPVersionOne] ? kCFHTTPVersion1_0 : kCFHTTPVersion1_1); if (!request) { @@ -666,6 +665,7 @@ static BOOL isiPhoneOS2; readStream = CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, request); } } + if (!readStream) { [[self cancelledLock] unlock]; [self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIInternalErrorWhileBuildingRequestType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Unable to create read stream",NSLocalizedDescriptionKey,nil]]]; @@ -813,16 +813,15 @@ static BOOL isiPhoneOS2; // This workaround prevents erroneous timeouts in low bandwidth situations (eg iPhone) if (totalBytesSent || postLength <= uploadBufferSize || (uploadBufferSize > 0 && totalBytesSent > uploadBufferSize)) { [self failWithError:ASIRequestTimedOutError]; - [[self cancelledLock] unlock]; [self cancelLoad]; [self setComplete:YES]; + [[self cancelledLock] unlock]; break; } } // Do we need to redirect? if ([self needsRedirect]) { - [[self cancelledLock] unlock]; [self cancelLoad]; [self setNeedsRedirect:NO]; [self setRedirectCount:[self redirectCount]+1]; @@ -830,8 +829,11 @@ static BOOL isiPhoneOS2; // Some naughty / badly coded website is trying to force us into a redirection loop. This is not cool. [self failWithError:ASITooMuchRedirectionError]; [self setComplete:YES]; + [[self cancelledLock] unlock]; } 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 + [self main]; } break; @@ -2801,7 +2803,7 @@ static BOOL isiPhoneOS2; return nil; } // Obtain the list of proxies by running the autoconfiguration script -#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_0 +#if TARGET_IPHONE_SIMULATOR && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_0 NSArray *proxies = [(NSArray *)CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)theURL) autorelease]; #else CFErrorRef err2 = NULL; Classes/ASIHTTPRequest.m @@ -17,6 +17,7 @@ } - (void)testBasicDownload; +- (void)testConditionalGET; - (void)testTimeOut; - (void)testRequestMethod; - (void)testHTTPVersion; @@ -47,6 +48,8 @@ - (void)testMainThreadDelegateAuthenticationFailure; //- (void)testCancelStressTest; //- (void)performCancelRequest; +//- (void)testRedirectStressTest; +//- (void)performRedirectRequest; @property (retain,nonatomic) ASIHTTPRequest *cancelRequest; @property (retain, nonatomic) NSDate *cancelStartDate; Classes/Tests/ASIHTTPRequestTests.h @@ -59,6 +59,32 @@ GHAssertTrue(success,@"Failed to generate an error for a bad host"); } +- (void)testConditionalGET +{ + ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/i/logo.png"]]; + [request start]; + BOOL success = ([request responseStatusCode] == 200); + GHAssertTrue(success, @"Failed to download file, cannot proceed with this test"); + success = ([[request responseData] length] > 0); + GHAssertTrue(success, @"Response length is 0, this shouldn't happen"); + + NSString *etag = [[request responseHeaders] objectForKey:@"Etag"]; + NSString *lastModified = [[request responseHeaders] objectForKey:@"Last-Modified"]; + + GHAssertNotNil(etag, @"Response didn't return an etag"); + GHAssertNotNil(lastModified, @"Response didn't return a last modified date"); + + request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/i/logo.png"]]; + [request addRequestHeader:@"If-Modified-Since" value:lastModified]; + [request addRequestHeader:@"If-None-Match" value:etag]; + [request start]; + success = ([request responseStatusCode] == 304); + GHAssertTrue(success, @"Got wrong status code"); + success = ([[request responseData] length] == 0); + GHAssertTrue(success, @"Response length is not 0, this shouldn't happen"); + +} + - (void)testCharacterEncoding { @@ -1099,6 +1125,37 @@ // [[self cancelRequest] startAsynchronous]; // } //} +// + +// Another stress test that looks from problems when redirecting. Again, don't run on a non-local server + +//- (void)testRedirectStressTest +//{ +// [self setCancelStartDate:[NSDate dateWithTimeIntervalSinceNow:30]]; +// [self performRedirectRequest]; +// while ([[self cancelStartDate] timeIntervalSinceNow] > 0) { +// [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.25]]; +// } +// NSLog(@"Redirect stress test: DONE"); +//} +// +//- (void)performRedirectRequest +//{ +// [[ASIHTTPRequest sharedRequestQueue] setMaxConcurrentOperationCount:20]; +// [self setCancelRequest:[ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://127.0.0.1/ASIHTTPRequest/tests/one_infinite_loop"]]]; +// if ([[self cancelStartDate] timeIntervalSinceNow] > 0) { +// NSLog(@"Redirect stress test: Start request %@",[self cancelRequest]); +// [[self cancelRequest] startAsynchronous]; +// [self performSelector:@selector(cancelRedirectRequest) withObject:nil afterDelay:0.2]; +// } +//} +// +//- (void)cancelRedirectRequest +//{ +// NSLog(@"Redirect stress test: Cancel request %@",[self cancelRequest]); +// [[self cancelRequest] cancel]; +// [self performRedirectRequest]; +//} - (void)setProgress:(float)newProgress; @@ -1111,12 +1168,15 @@ NSLog(@"Stress test: Cancel request %@",[self cancelRequest]); [[self cancelRequest] cancel]; - [self setCancelRequest:nil]; [self performSelector:@selector(performCancelRequest) withObject:nil afterDelay:0.2]; + [self setCancelRequest:nil]; } } + + + @synthesize cancelRequest; @synthesize cancelStartDate; @end \ No newline at end of file Classes/Tests/ASIHTTPRequestTests.m 47b4e2cc35e094799db094a74ed6d4e8dc9a5e7e Ben Copsey ben@allseeing-i.com http://github.com/pokeb/asi-http-request/commit/7c0eddf2c93fe2e8f09533bee6bba57fad09d13e 7c0eddf2c93fe2e8f09533bee6bba57fad09d13e 2009-10-30T08:59:13-07:00 2009-10-30T08:59:13-07:00 Fix one more potential lock-related crash Added additional tests - conditional get, + new stress test Hopefully fix 2.2.1 device+simulator builds - but I can't test the simulator build is working 36ef7942a0bda22d144bb6bfc6b41d4a066c4494 Ben Copsey ben@allseeing-i.com