Progress updates should now only happen in the main thread, fixing iphone issues

@@ -112,9 +112,6 @@
 	//This lock will block the request until the delegate supplies authentication info
 	//This lock will block the request until the delegate supplies authentication info
 	NSConditionLock *authenticationLock;
 	NSConditionLock *authenticationLock;
 	
 	
-	//This lock prevents the operation from being cancelled while it is trying to update the progress, and vice versa
-	NSLock *progressLock;
-	
 	//Called on the delegate when the request completes successfully
 	//Called on the delegate when the request completes successfully
 	SEL didFinishSelector;
 	SEL didFinishSelector;
 	
 	

@@ -31,6 +31,9 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
     [((ASIHTTPRequest*)clientCallBackInfo) handleNetworkEvent: type];
     [((ASIHTTPRequest*)clientCallBackInfo) handleNetworkEvent: type];
 }
 }
 
 
+//This lock prevents the operation from being cancelled while it is trying to update the progress, and vice versa
+
+static NSLock *progressLock;
 
 
 @implementation ASIHTTPRequest
 @implementation ASIHTTPRequest
 
 
@@ -38,6 +41,11 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 
 
 #pragma mark init / dealloc
 #pragma mark init / dealloc
 
 
+- (void)initialize
+{
+	progressLock = [[NSLock alloc] init];
+}
+
 - (id)initWithURL:(NSURL *)newURL
 - (id)initWithURL:(NSURL *)newURL
 {
 {
 	self = [super init];
 	self = [super init];
@@ -85,7 +93,6 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 	[domain release];
 	[domain release];
 	[authenticationRealm release];
 	[authenticationRealm release];
 	[url release];
 	[url release];
-	[progressLock release];
 	[authenticationLock release];
 	[authenticationLock release];
 	[lastActivityTime release];
 	[lastActivityTime release];
 	[responseCookies release];
 	[responseCookies release];
@@ -214,9 +221,6 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 - (void)loadRequest
 - (void)loadRequest
 {
 {
 	CFRunLoopAddCommonMode(CFRunLoopGetCurrent(),ASIHTTPRequestRunMode);
 	CFRunLoopAddCommonMode(CFRunLoopGetCurrent(),ASIHTTPRequestRunMode);
-
-	[progressLock release];
-	progressLock = [[NSLock alloc] init];
 	
 	
 	[authenticationLock release];
 	[authenticationLock release];
 	authenticationLock = [[NSConditionLock alloc] initWithCondition:1];
 	authenticationLock = [[NSConditionLock alloc] initWithCondition:1];
@@ -270,14 +274,18 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 	}
 	}
 
 
 	//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 new] autorelease]];
+	[self setLastActivityTime:[NSDate date]];
 	
 	
 	// Wait for the request to finish
 	// Wait for the request to finish
 	while (!complete) {
 	while (!complete) {
 		
 		
+		//This may take a while, so we'll release the pool each cycle to stop a giant backlog building up
+		[pool release];
+		pool = [[NSAutoreleasePool alloc] init];
+		
 		//See if we need to timeout
 		//See if we need to timeout
 		if (lastActivityTime && timeOutSeconds > 0) {
 		if (lastActivityTime && timeOutSeconds > 0) {
-			if ([[[NSDate new] autorelease] timeIntervalSinceDate:lastActivityTime] > timeOutSeconds) {
+			if ([[NSDate date] timeIntervalSinceDate:lastActivityTime] > timeOutSeconds) {
 				[self failWithProblem:@"Request timed out"];
 				[self failWithProblem:@"Request timed out"];
 				[self cancelLoad];
 				[self cancelLoad];
 				complete = YES;
 				complete = YES;
@@ -292,7 +300,7 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 			complete = YES;
 			complete = YES;
 			break;
 			break;
 		}
 		}
-		[self updateProgressIndicators];
+		[self performSelectorOnMainThread:@selector(updateProgressIndicators) withObject:nil waitUntilDone:YES];
 		
 		
 		//This thread should wait for 1/4 second for the stream to do something. We'll stop early if it does.
 		//This thread should wait for 1/4 second for the stream to do something. We'll stop early if it does.
 		CFRunLoopRunInMode(ASIHTTPRequestRunMode,0.25,YES);
 		CFRunLoopRunInMode(ASIHTTPRequestRunMode,0.25,YES);
@@ -332,20 +340,16 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 
 
 - (void)updateProgressIndicators
 - (void)updateProgressIndicators
 {
 {
-	[progressLock lock];
-	if ([self isCancelled]) {
-		[progressLock unlock];
-		return;
-	}
+
 	[self updateUploadProgress];
 	[self updateUploadProgress];
 	[self updateDownloadProgress];
 	[self updateDownloadProgress];
-	[progressLock unlock];
 
 
 }
 }
 
 
 
 
 + (void)setProgress:(double)progress forProgressIndicator:(id)indicator
 + (void)setProgress:(double)progress forProgressIndicator:(id)indicator
 {
 {
+
 	SEL selector;
 	SEL selector;
 	
 	
 	//Cocoa Touch: UIProgressView
 	//Cocoa Touch: UIProgressView
@@ -393,6 +397,12 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 
 
 -(void)removeUploadProgressSoFar
 -(void)removeUploadProgressSoFar
 {
 {
+	[progressLock lock];
+	if ([self isCancelled]) {
+		[progressLock unlock];
+		return;
+	}
+	
 	//We're using a progress queue or compatible controller to handle progress
 	//We're using a progress queue or compatible controller to handle progress
 	if ([uploadProgressDelegate respondsToSelector:@selector(incrementUploadProgressBy:)]) {
 	if ([uploadProgressDelegate respondsToSelector:@selector(incrementUploadProgressBy:)]) {
 		int value = 0-lastBytesSent;
 		int value = 0-lastBytesSent;
@@ -407,12 +417,19 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 	//We aren't using a queue, we should just set progress of the indicator to 0
 	//We aren't using a queue, we should just set progress of the indicator to 0
 	} else {
 	} else {
 		[ASIHTTPRequest setProgress:0 forProgressIndicator:uploadProgressDelegate];
 		[ASIHTTPRequest setProgress:0 forProgressIndicator:uploadProgressDelegate];
-	}	
+	}
+	[progressLock unlock];
 }
 }
 
 
 
 
 - (void)resetUploadProgress:(NSNumber *)max
 - (void)resetUploadProgress:(NSNumber *)max
 {
 {
+	[progressLock lock];
+	if ([self isCancelled]) {
+		[progressLock unlock];
+		return;
+	}	
+	
 	//We're using a progress queue or compatible controller to handle progress
 	//We're using a progress queue or compatible controller to handle progress
 	if ([uploadProgressDelegate respondsToSelector:@selector(incrementUploadSizeBy:)]) {
 	if ([uploadProgressDelegate respondsToSelector:@selector(incrementUploadSizeBy:)]) {
 		int value = [max intValue];
 		int value = [max intValue];
@@ -426,11 +443,18 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 	} else {
 	} else {
 		[ASIHTTPRequest setProgress:0 forProgressIndicator:uploadProgressDelegate];
 		[ASIHTTPRequest setProgress:0 forProgressIndicator:uploadProgressDelegate];
 	}
 	}
+	[progressLock unlock];
 }		
 }		
 
 
 - (void)updateUploadProgress
 - (void)updateUploadProgress
 {
 {
-	[self setLastActivityTime:[[NSDate new] autorelease]];
+	[progressLock lock];
+	if ([self isCancelled]) {
+		[progressLock unlock];
+		return;
+	}
+	
+	[self setLastActivityTime:[NSDate date]];
 	
 	
 	unsigned int byteCount = [[(NSNumber *)CFReadStreamCopyProperty (readStream, kCFStreamPropertyHTTPRequestBytesWrittenCount) autorelease] unsignedIntValue];
 	unsigned int byteCount = [[(NSNumber *)CFReadStreamCopyProperty (readStream, kCFStreamPropertyHTTPRequestBytesWrittenCount) autorelease] unsignedIntValue];
 	if (uploadProgressDelegate) {
 	if (uploadProgressDelegate) {
@@ -439,7 +463,8 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 		if ([uploadProgressDelegate respondsToSelector:@selector(incrementUploadProgressBy:)]) {
 		if ([uploadProgressDelegate respondsToSelector:@selector(incrementUploadProgressBy:)]) {
 			int value = byteCount-lastBytesSent;
 			int value = byteCount-lastBytesSent;
 			SEL selector = @selector(incrementUploadProgressBy:);
 			SEL selector = @selector(incrementUploadProgressBy:);
-			NSMethodSignature *signature = [[uploadProgressDelegate class] instanceMethodSignatureForSelector:selector];
+			NSMethodSignature *signature = nil;
+			signature = [[uploadProgressDelegate class] instanceMethodSignatureForSelector:selector];
 			NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
 			NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
 			[invocation setTarget:uploadProgressDelegate];
 			[invocation setTarget:uploadProgressDelegate];
 			[invocation setSelector:selector];
 			[invocation setSelector:selector];
@@ -453,11 +478,19 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 		
 		
 	}
 	}
 	lastBytesSent = byteCount;
 	lastBytesSent = byteCount;
+	[progressLock unlock];
 }
 }
 
 
 
 
 - (void)resetDownloadProgress:(NSNumber *)max
 - (void)resetDownloadProgress:(NSNumber *)max
 {
 {
+	[progressLock lock];
+	if ([self isCancelled]) {
+		[progressLock unlock];
+		return;
+	}	
+	
+	
 	//We're using a progress queue or compatible controller to handle progress
 	//We're using a progress queue or compatible controller to handle progress
 	if ([downloadProgressDelegate respondsToSelector:@selector(incrementDownloadSizeBy:)]) {
 	if ([downloadProgressDelegate respondsToSelector:@selector(incrementDownloadSizeBy:)]) {
 		int value = [max intValue];
 		int value = [max intValue];
@@ -471,17 +504,27 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 	} else {
 	} else {
 		[ASIHTTPRequest setProgress:0 forProgressIndicator:downloadProgressDelegate];
 		[ASIHTTPRequest setProgress:0 forProgressIndicator:downloadProgressDelegate];
 	}
 	}
+	[progressLock unlock];
 }	
 }	
 
 
 - (void)updateDownloadProgress
 - (void)updateDownloadProgress
 {
 {
-	[self setLastActivityTime:[[NSDate new] autorelease]];
+	[progressLock lock];
+	if ([self isCancelled]) {
+		[progressLock unlock];
+		return;
+	}	
+	
+	[self setLastActivityTime:[NSDate date]];
 	
 	
 	//We won't update downlaod progress until we've examined the headers, since we might need to authenticate
 	//We won't update downlaod progress until we've examined the headers, since we might need to authenticate
 	if (downloadProgressDelegate && responseHeaders) {
 	if (downloadProgressDelegate && responseHeaders) {
 
 
 		//We're using a progress queue or compatible controller to handle progress
 		//We're using a progress queue or compatible controller to handle progress
 		if ([downloadProgressDelegate respondsToSelector:@selector(incrementDownloadProgressBy:)]) {
 		if ([downloadProgressDelegate respondsToSelector:@selector(incrementDownloadProgressBy:)]) {
+			
+			NSAutoreleasePool *thePool = [[NSAutoreleasePool alloc] init];
+			
 			int value = totalBytesRead-lastBytesRead;
 			int value = totalBytesRead-lastBytesRead;
 			SEL selector = @selector(incrementDownloadProgressBy:);
 			SEL selector = @selector(incrementDownloadProgressBy:);
 			NSMethodSignature *signature = [[downloadProgressDelegate class] instanceMethodSignatureForSelector:selector];
 			NSMethodSignature *signature = [[downloadProgressDelegate class] instanceMethodSignatureForSelector:selector];
@@ -491,13 +534,16 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
 			[invocation setArgument:&value atIndex:2];
 			[invocation setArgument:&value atIndex:2];
 			[invocation invoke];
 			[invocation invoke];
 			
 			
+			[thePool release];
+			
 			//We aren't using a queue, we should just set progress of the indicator to 0
 			//We aren't using a queue, we should just set progress of the indicator to 0
 		} else if (contentLength > 0)  {
 		} else if (contentLength > 0)  {
 			[ASIHTTPRequest setProgress:(double)(totalBytesRead/contentLength) forProgressIndicator:downloadProgressDelegate];
 			[ASIHTTPRequest setProgress:(double)(totalBytesRead/contentLength) forProgressIndicator:downloadProgressDelegate];
 		}
 		}
 		
 		
 		lastBytesRead = totalBytesRead;
 		lastBytesRead = totalBytesRead;
-	} 
+	}
+	[progressLock unlock];
 }
 }
 
 
 #pragma mark handling request complete / failure
 #pragma mark handling request complete / failure

@@ -80,8 +80,16 @@
 {
 {
 	if ([operation isKindOfClass:[ASIHTTPRequest class]]) {
 	if ([operation isKindOfClass:[ASIHTTPRequest class]]) {
 		requestsCount++;
 		requestsCount++;
-		[(ASIHTTPRequest *)operation setUploadProgressDelegate:self];
-		[(ASIHTTPRequest *)operation setDownloadProgressDelegate:self];
+		if (uploadProgressDelegate) {
+			[(ASIHTTPRequest *)operation setUploadProgressDelegate:self];
+		} else {
+			[(ASIHTTPRequest *)operation setUploadProgressDelegate:NULL];
+		}
+		if (downloadProgressDelegate) {
+			[(ASIHTTPRequest *)operation setDownloadProgressDelegate:self];
+		} else {
+			[(ASIHTTPRequest *)operation setDownloadProgressDelegate:NULL];	
+		}
 		[(ASIHTTPRequest *)operation setDelegate:self];
 		[(ASIHTTPRequest *)operation setDelegate:self];
 		[(ASIHTTPRequest *)operation setDidFailSelector:@selector(requestDidFail:)];
 		[(ASIHTTPRequest *)operation setDidFailSelector:@selector(requestDidFail:)];
 		[(ASIHTTPRequest *)operation setDidFinishSelector:@selector(requestDidFinish:)];
 		[(ASIHTTPRequest *)operation setDidFinishSelector:@selector(requestDidFinish:)];

 To do:
 To do:
+Add note about not locking main thread when using progress
 Replace this with a link to the docs?
 Replace this with a link to the docs?
+Add to release notes - lots of leaks fixed, and it it releases temporary stuff during a request rather than waiting until the end
 
 
 
 
 [NEW!] Documentation is available at: http://allseeing-i.com/asi-http-request
 [NEW!] Documentation is available at: http://allseeing-i.com/asi-http-request