* Fix an issue with ASIDataCompressor that would have caused it to fail to defla…

…te files larger than 256KB
* Move requestFinished: back onto the request thread as running on the main thread caused breakage in subclasses (including S3)
* Tweaks to ASIDataDecompressor to make it match the new behaviour of ASIDataCompressor
* Improve tests for gzip

@@ -22,7 +22,8 @@
 + (id)compressor;
 + (id)compressor;
 
 
 // Compress the passed chunk of data
 // Compress the passed chunk of data
-- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err;
+// Passing YES for shouldFinish will finalize the deflated data - you must pass YES when you are on the last chunk of data
+- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err shouldFinish:(BOOL)shouldFinish;
 
 
 // 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:(NSUInteger)length error:(NSError **)err
+- (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err shouldFinish:(BOOL)shouldFinish
 {
 {
 	if (length == 0) return nil;
 	if (length == 0) return nil;
 	
 	
@@ -91,17 +91,14 @@
 		
 		
 		zStream.next_out = [outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
 		zStream.next_out = [outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
 		zStream.avail_out = (unsigned int)([outputData length] - (zStream.total_out-bytesProcessedAlready));
 		zStream.avail_out = (unsigned int)([outputData length] - (zStream.total_out-bytesProcessedAlready));
-		
-		status = deflate(&zStream, Z_FINISH); 
+		status = deflate(&zStream, shouldFinish ? Z_FINISH : Z_NO_FLUSH);
 		
 		
 		if (status == Z_STREAM_END) {
 		if (status == Z_STREAM_END) {
-			theError = [self closeStream];
 			break;
 			break;
 		} else if (status != Z_OK) {
 		} else if (status != Z_OK) {
 			if (err) {
 			if (err) {
 				*err = [[self class] deflateErrorWithCode:status];
 				*err = [[self class] deflateErrorWithCode:status];
 			}
 			}
-			[self closeStream];
 			return NO;
 			return NO;
 		}
 		}
 	}
 	}
@@ -122,7 +119,7 @@
 + (NSData *)compressData:(NSData*)uncompressedData error:(NSError **)err
 + (NSData *)compressData:(NSData*)uncompressedData error:(NSError **)err
 {
 {
 	NSError *theError = nil;
 	NSError *theError = nil;
-	NSData *outputData = [[ASIDataCompressor compressor] compressBytes:(Bytef *)[uncompressedData bytes] length:[uncompressedData length] error:&theError];
+	NSData *outputData = [[ASIDataCompressor compressor] compressBytes:(Bytef *)[uncompressedData bytes] length:[uncompressedData length] error:&theError shouldFinish:YES];
 	if (theError) {
 	if (theError) {
 		if (err) {
 		if (err) {
 			*err = theError;
 			*err = theError;
@@ -170,23 +167,27 @@
 		
 		
 		// Read some data from the file
 		// Read some data from the file
 		readLength = [inputStream read:inputData maxLength:DATA_CHUNK_SIZE];
 		readLength = [inputStream read:inputData maxLength:DATA_CHUNK_SIZE];
-		
 
 
 		// Make sure nothing went wrong
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
-			[compressor closeStream];
 			if (err) {
 			if (err) {
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to read from the source data file",sourcePath],NSLocalizedDescriptionKey,[inputStream streamError],NSUnderlyingErrorKey,nil]];
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to read from the source data file",sourcePath],NSLocalizedDescriptionKey,[inputStream streamError],NSUnderlyingErrorKey,nil]];
 			}
 			}
+			[compressor closeStream];
 			return NO;
 			return NO;
 		}
 		}
+		// Have we reached the end of the input data?
+		if (!readLength) {
+			break;
+		}
 		
 		
-		// Attempt to inflate the chunk of data
-		outputData = [compressor compressBytes:inputData length:readLength error:&theError];
+		// Attempt to deflate the chunk of data
+		outputData = [compressor compressBytes:inputData length:readLength error:&theError shouldFinish:readLength < DATA_CHUNK_SIZE ];
 		if (theError) {
 		if (theError) {
 			if (err) {
 			if (err) {
 				*err = theError;
 				*err = theError;
 			}
 			}
+			[compressor closeStream];
 			return NO;
 			return NO;
 		}
 		}
 		
 		
@@ -195,17 +196,25 @@
 		
 		
 		// Make sure nothing went wrong
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
-			[compressor closeStream];
 			if (err) {
 			if (err) {
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
             }
             }
+			[compressor closeStream];
 			return NO;
 			return NO;
 		}
 		}
 		
 		
     }
     }
-	
 	[inputStream close];
 	[inputStream close];
 	[outputStream close];
 	[outputStream close];
+
+	NSError *error = [compressor closeStream];
+	if (error) {
+		if (err) {
+			*err = error;
+		}
+		return NO;
+	}
+
 	return YES;
 	return YES;
 }
 }
 
 

@@ -89,16 +89,14 @@
 		zStream.next_out = [outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
 		zStream.next_out = [outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
 		zStream.avail_out = (unsigned int)([outputData length] - (zStream.total_out-bytesProcessedAlready));
 		zStream.avail_out = (unsigned int)([outputData length] - (zStream.total_out-bytesProcessedAlready));
 		
 		
-		status = inflate(&zStream, Z_SYNC_FLUSH);
+		status = inflate(&zStream, Z_NO_FLUSH);
 		
 		
 		if (status == Z_STREAM_END) {
 		if (status == Z_STREAM_END) {
-			theError = [self closeStream];
 			break;
 			break;
 		} else if (status != Z_OK) {
 		} else if (status != Z_OK) {
 			if (err) {
 			if (err) {
 				*err = [[self class] inflateErrorWithCode:status];
 				*err = [[self class] inflateErrorWithCode:status];
 			}
 			}
-			[self closeStream];
 			return nil;
 			return nil;
 		}
 		}
 	}
 	}
@@ -169,12 +167,16 @@
 		
 		
 		// Make sure nothing went wrong
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
-            [decompressor closeStream];
 			if (err) {
 			if (err) {
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to read from the source data file",sourcePath],NSLocalizedDescriptionKey,[inputStream streamError],NSUnderlyingErrorKey,nil]];
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to read from the source data file",sourcePath],NSLocalizedDescriptionKey,[inputStream streamError],NSUnderlyingErrorKey,nil]];
 			}
 			}
+            [decompressor closeStream];
 			return NO;
 			return NO;
 		}
 		}
+		// Have we reached the end of the input data?
+		if (!readLength) {
+			break;
+		}
 
 
 		// Attempt to inflate the chunk of data
 		// Attempt to inflate the chunk of data
 		outputData = [decompressor uncompressBytes:inputData length:readLength error:&theError];
 		outputData = [decompressor uncompressBytes:inputData length:readLength error:&theError];
@@ -182,6 +184,7 @@
 			if (err) {
 			if (err) {
 				*err = theError;
 				*err = theError;
 			}
 			}
+			[decompressor closeStream];
 			return NO;
 			return NO;
 		}
 		}
 		
 		
@@ -190,10 +193,10 @@
 		
 		
 		// Make sure nothing went wrong
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
-			[decompressor closeStream];
 			if (err) {
 			if (err) {
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
 				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
             }
             }
+			[decompressor closeStream];
 			return NO;
 			return NO;
 		}
 		}
 		
 		
@@ -201,6 +204,15 @@
 	
 	
 	[inputStream close];
 	[inputStream close];
 	[outputStream close];
 	[outputStream close];
+
+	NSError *error = [decompressor closeStream];
+	if (error) {
+		if (err) {
+			*err = error;
+		}
+		return NO;
+	}
+
 	return YES;
 	return YES;
 }
 }
 
 

@@ -24,7 +24,7 @@
 #import "ASIDataCompressor.h"
 #import "ASIDataCompressor.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.8-21 2010-12-04";
+NSString *ASIHTTPRequestVersion = @"v1.8-22 2010-12-13";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -1930,7 +1930,6 @@ static NSOperationQueue *sharedQueue = nil;
 	}
 	}
 }
 }
 
 
-/* ALWAYS CALLED ON MAIN THREAD! */
 // Subclasses might override this method to process the result in the same thread
 // Subclasses might override this method to process the result in the same thread
 // If you do this, don't forget to call [super requestFinished] to let the queue / delegate know we're done
 // If you do this, don't forget to call [super requestFinished] to let the queue / delegate know we're done
 - (void)requestFinished
 - (void)requestFinished
@@ -1941,18 +1940,23 @@ static NSOperationQueue *sharedQueue = nil;
 	if ([self error] || [self mainRequest]) {
 	if ([self error] || [self mainRequest]) {
 		return;
 		return;
 	}
 	}
+	[self performSelectorOnMainThread:@selector(reportFinished) withObject:nil waitUntilDone:[NSThread isMainThread]];
+}
 
 
+/* ALWAYS CALLED ON MAIN THREAD! */
+- (void)reportFinished
+{
 	if (delegate && [delegate respondsToSelector:didFinishSelector]) {
 	if (delegate && [delegate respondsToSelector:didFinishSelector]) {
 		[delegate performSelector:didFinishSelector withObject:self];
 		[delegate performSelector:didFinishSelector withObject:self];
 	}
 	}
 	if (queue && [queue respondsToSelector:@selector(requestFinished:)]) {
 	if (queue && [queue respondsToSelector:@selector(requestFinished:)]) {
 		[queue performSelector:@selector(requestFinished:) withObject:self];
 		[queue performSelector:@selector(requestFinished:) withObject:self];
 	}
 	}
-	#if NS_BLOCKS_AVAILABLE
+#if NS_BLOCKS_AVAILABLE
 	if(completionBlock){
 	if(completionBlock){
 		completionBlock();
 		completionBlock();
 	}
 	}
-	#endif
+#endif
 }
 }
 
 
 /* ALWAYS CALLED ON MAIN THREAD! */
 /* ALWAYS CALLED ON MAIN THREAD! */
@@ -3245,7 +3249,7 @@ static NSOperationQueue *sharedQueue = nil;
 		if (fileError) {
 		if (fileError) {
 			[self failWithError:fileError];
 			[self failWithError:fileError];
 		} else {
 		} else {
-			[self performSelectorOnMainThread:@selector(requestFinished) withObject:nil waitUntilDone:[NSThread isMainThread]];
+			[self requestFinished];
 		}
 		}
 
 
 		[self markAsFinished];
 		[self markAsFinished];
@@ -3344,7 +3348,7 @@ static NSOperationQueue *sharedQueue = nil;
 	}
 	}
 
 
 	[theRequest updateProgressIndicators];
 	[theRequest updateProgressIndicators];
-	[theRequest performSelectorOnMainThread:@selector(requestFinished) withObject:nil waitUntilDone:[NSThread isMainThread]];
+	[theRequest requestFinished];
 	[theRequest markAsFinished];	
 	[theRequest markAsFinished];	
 	if ([self mainRequest]) {
 	if ([self mainRequest]) {
 		[self markAsFinished];
 		[self markAsFinished];

@@ -14,17 +14,25 @@
 
 
 @implementation ASIDataCompressorTests
 @implementation ASIDataCompressorTests
 
 
+- (void)setUp
+{
+	NSFileManager *fileManager = [[[NSFileManager alloc] init] autorelease];
+
+	// Download a 1.7MB text file
+	NSString *filePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"story.txt"];
+	if (![fileManager fileExistsAtPath:filePath] || [[[fileManager attributesOfItemAtPath:filePath error:NULL] objectForKey:NSFileSize] unsignedLongLongValue] < 1693961) {
+		ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/the_hound_of_the_baskervilles.text"]];
+		[request setDownloadDestinationPath:[[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"story.txt"]];
+		[request startSynchronous];
+	}
+}
 
 
 - (void)testInflateData
 - (void)testInflateData
 {
 {
-	// Test in-memory inflate using uncompressData:error:
-	NSUInteger i;
-	
-	NSString *originalString = [NSString string];
-	for (i=0; i<1000; i++) {
-		originalString = [originalString stringByAppendingFormat:@"This is line %i\r\n",i];
-	}
+
+	NSString *originalString = [NSString stringWithContentsOfFile:[[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"story.txt"] encoding:NSUTF8StringEncoding error:NULL];
 	
 	
+	// Test in-memory inflate using uncompressData:error:
 	NSError *error = nil;
 	NSError *error = nil;
 	NSString *filePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"uncompressed_file.txt"];
 	NSString *filePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"uncompressed_file.txt"];
 	NSString *gzippedFilePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"uncompressed_file.txt.gz"];
 	NSString *gzippedFilePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"uncompressed_file.txt.gz"];
@@ -79,13 +87,10 @@
 
 
 - (void)testDeflateData
 - (void)testDeflateData
 {
 {
-	// Test in-memory deflate using compressData:error:
-	NSUInteger i;
+
+	NSString *originalString = [NSString stringWithContentsOfFile:[[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"story.txt"] encoding:NSUTF8StringEncoding error:NULL];
 	
 	
-	NSString *originalString = [NSString string];
-	for (i=0; i<1000; i++) {
-		originalString = [originalString stringByAppendingFormat:@"This is line %i\r\n",i];
-	}
+	// Test in-memory deflate using compressData:error:
 	NSError *error = nil;
 	NSError *error = nil;
 	NSData *deflatedData = [ASIDataCompressor compressData:[originalString dataUsingEncoding:NSUTF8StringEncoding] error:&error];
 	NSData *deflatedData = [ASIDataCompressor compressData:[originalString dataUsingEncoding:NSUTF8StringEncoding] error:&error];
 	if (error) {
 	if (error) {
@@ -104,6 +109,10 @@
 	}
 	}
 	
 	
 	NSString *filePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"uncompressed_file.txt"];
 	NSString *filePath = [[self filePathForTemporaryTestFiles] stringByAppendingPathComponent:@"uncompressed_file.txt"];
+	[ASIHTTPRequest removeFileAtPath:filePath error:&error];
+	if (error) {
+		GHFail(@"Failed to remove old file, cannot proceed with test");
+	}
 	
 	
 	NSTask *task = [[[NSTask alloc] init] autorelease];
 	NSTask *task = [[[NSTask alloc] init] autorelease];
 	[task setLaunchPath:@"/usr/bin/gzip"];
 	[task setLaunchPath:@"/usr/bin/gzip"];