Fix casting warnings

Add new test for delegate data handling

@@ -22,7 +22,7 @@
 + (id)compressor;
 + (id)compressor;
 
 
 // Compress the passed chunk of data
 // Compress the passed chunk of data
-- (NSData *)compressBytes:(Bytef *)bytes length:(NSInteger)length error:(NSError **)err;
+- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err;
 
 
 // Convenience method - pass it some data, and you'll get deflated data back
 // Convenience method - pass it some data, and you'll get deflated data back
 + (NSData *)compressData:(NSData*)uncompressedData error:(NSError **)err;
 + (NSData *)compressData:(NSData*)uncompressedData error:(NSError **)err;

@@ -66,7 +66,7 @@
 	return nil;
 	return nil;
 }
 }
 
 
-- (NSData *)compressBytes:(Bytef *)bytes length:(NSInteger)length error:(NSError **)err
+- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err
 {
 {
 	if (length == 0) return nil;
 	if (length == 0) return nil;
 	
 	
@@ -78,7 +78,7 @@
 	int status;
 	int status;
 	
 	
 	zStream.next_in = bytes;
 	zStream.next_in = bytes;
-	zStream.avail_in = length;
+	zStream.avail_in = (unsigned int)length;
 	zStream.avail_out = 0;
 	zStream.avail_out = 0;
 	NSError *theError = nil;
 	NSError *theError = nil;
 	
 	
@@ -151,7 +151,7 @@
 	
 	
 	UInt8 inputData[DATA_CHUNK_SIZE];
 	UInt8 inputData[DATA_CHUNK_SIZE];
 	NSData *outputData;
 	NSData *outputData;
-	int readLength;
+	NSInteger readLength;
 	NSError *theError = nil;
 	NSError *theError = nil;
 	
 	
 	ASIDataCompressor *compressor = [ASIDataCompressor compressor];
 	ASIDataCompressor *compressor = [ASIDataCompressor compressor];

@@ -22,7 +22,7 @@
 + (id)decompressor;
 + (id)decompressor;
 
 
 // Uncompress the passed chunk of data
 // Uncompress the passed chunk of data
-- (NSData *)uncompressBytes:(Bytef *)bytes length:(NSInteger)length error:(NSError **)err;
+- (NSData *)uncompressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err;
 
 
 // Convenience method - pass it some deflated data, and you'll get inflated data back
 // Convenience method - pass it some deflated data, and you'll get inflated data back
 + (NSData *)uncompressData:(NSData*)compressedData error:(NSError **)err;
 + (NSData *)uncompressData:(NSData*)compressedData error:(NSError **)err;

@@ -65,7 +65,7 @@
 	return nil;
 	return nil;
 }
 }
 
 
-- (NSData *)uncompressBytes:(Bytef *)bytes length:(NSInteger)length error:(NSError **)err
+- (NSData *)uncompressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err
 {
 {
 	if (length == 0) return nil;
 	if (length == 0) return nil;
 	
 	
@@ -75,7 +75,7 @@
 	int status;
 	int status;
 	
 	
 	zStream.next_in = bytes;
 	zStream.next_in = bytes;
-	zStream.avail_in = length;
+	zStream.avail_in = (unsigned int)length;
 	zStream.avail_out = 0;
 	zStream.avail_out = 0;
 	NSError *theError = nil;
 	NSError *theError = nil;
 	
 	
@@ -149,7 +149,7 @@
 	
 	
 	UInt8 inputData[DATA_CHUNK_SIZE];
 	UInt8 inputData[DATA_CHUNK_SIZE];
 	NSData *outputData;
 	NSData *outputData;
-	int readLength;
+	NSInteger readLength;
 	NSError *theError = nil;
 	NSError *theError = nil;
 	
 	
 	ASIDataDecompressor *decompressor = [ASIDataDecompressor decompressor];
 	ASIDataDecompressor *decompressor = [ASIDataDecompressor decompressor];

@@ -24,7 +24,7 @@
 #import "ASIDataCompressor.h"
 #import "ASIDataCompressor.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.7-43 2010-08-17";
+NSString *ASIHTTPRequestVersion = @"v1.7-44 2010-08-18";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 

@@ -667,6 +667,71 @@
 	GHAssertTrue(success,@"Failed to download data to a file");
 	GHAssertTrue(success,@"Failed to download data to a file");
 }
 }
 
 
+- (void)request:(ASIHTTPRequest *)request didGetMoreData:(NSData *)data
+{
+	[[self responseData] appendData:data];
+}
+
+- (void)downloadFinished:(ASIHTTPRequest *)request
+{
+	finished = YES;
+}
+
+- (void)testCompressedResponseDelegateDataHandling
+{
+	finished = NO;
+	[self setResponseData:[NSMutableData data]];
+
+	NSURL *url = [[[NSURL alloc] initWithString:@"http://asi/ASIHTTPRequest/tests/the_hound_of_the_baskervilles.text"] autorelease];
+
+	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
+	[request startSynchronous];
+
+	NSString *response = [request responseString];
+
+	// Now download again, using the delegate to handle the data
+	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
+	[request setDelegate:self];
+	[request setDidReceiveDataSelector:@selector(request:didGetMoreData:)];
+	[request setDidFinishSelector:@selector(downloadFinished:)];
+	[request setShouldWaitToInflateCompressedResponses:NO];
+	[request startSynchronous];
+
+	while (!finished) {
+		sleep(1);
+	}
+
+	NSString *delegateResponse = [[[NSString alloc] initWithBytes:[responseData bytes] length:[responseData length] encoding:[request responseEncoding]] autorelease];
+	BOOL success = [delegateResponse isEqualToString:response];
+	GHAssertTrue(success,@"Failed to correctly download the response using a delegate");
+
+	// Test again without compression
+	finished = NO;
+	[self setResponseData:[NSMutableData data]];
+
+	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
+	[request setAllowCompressedResponse:NO];
+	[request startSynchronous];
+
+	response = [request responseString];
+
+	// Now download again, using the delegate to handle the data
+	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
+	[request setDelegate:self];
+	[request setDidReceiveDataSelector:@selector(request:didGetMoreData:)];
+	[request setDidFinishSelector:@selector(downloadFinished:)];
+	[request setAllowCompressedResponse:NO];
+	[request startSynchronous];
+
+	while (!finished) {
+		sleep(1);
+	}
+
+	delegateResponse = [[[NSString alloc] initWithBytes:[responseData bytes] length:[responseData length] encoding:[request responseEncoding]] autorelease];
+	success = [delegateResponse isEqualToString:response];
+	GHAssertTrue(success,@"Failed to correctly download the response using a delegate");
+}
+
 
 
 - (void)testDownloadProgress
 - (void)testDownloadProgress
 {
 {