More care with ASIDownloadCache locks

Fix lock regression in ASIHTTPRequest

@@ -69,10 +69,12 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 	for (NSString *directory in directories) {
 	for (NSString *directory in directories) {
 		BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDirectory];
 		BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDirectory];
 		if (exists && !isDirectory) {
 		if (exists && !isDirectory) {
+			[[self accessLock] unlock];
 			[NSException raise:@"FileExistsAtCachePath" format:@"Cannot create a directory for the cache at '%@', because a file already exists",directory];
 			[NSException raise:@"FileExistsAtCachePath" format:@"Cannot create a directory for the cache at '%@', because a file already exists",directory];
 		} else if (!exists) {
 		} else if (!exists) {
 			[[NSFileManager defaultManager] createDirectoryAtPath:directory attributes:nil];
 			[[NSFileManager defaultManager] createDirectoryAtPath:directory attributes:nil];
 			if (![[NSFileManager defaultManager] fileExistsAtPath:directory]) {
 			if (![[NSFileManager defaultManager] fileExistsAtPath:directory]) {
+				[[self accessLock] unlock];
 				[NSException raise:@"FailedToCreateCacheDirectory" format:@"Failed to create a directory for the cache at '%@'",directory];
 				[NSException raise:@"FailedToCreateCacheDirectory" format:@"Failed to create a directory for the cache at '%@'",directory];
 			}
 			}
 		}
 		}
@@ -138,21 +140,26 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 
 
 - (NSDictionary *)cachedHeadersForRequest:(ASIHTTPRequest *)request
 - (NSDictionary *)cachedHeadersForRequest:(ASIHTTPRequest *)request
 {
 {
+	[[self accessLock] lock];
 	if (![self storagePath]) {
 	if (![self storagePath]) {
+		[[self accessLock] unlock];
 		return nil;
 		return nil;
 	}
 	}
 	// Look in the session store
 	// Look in the session store
 	NSString *path = [[self storagePath] stringByAppendingPathComponent:sessionCacheFolder];
 	NSString *path = [[self storagePath] stringByAppendingPathComponent:sessionCacheFolder];
 	NSString *dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cachedheaders"]];
 	NSString *dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cachedheaders"]];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
+		[[self accessLock] unlock];
 		return [NSDictionary dictionaryWithContentsOfFile:dataPath];
 		return [NSDictionary dictionaryWithContentsOfFile:dataPath];
 	}
 	}
 	// Look in the permanent store
 	// Look in the permanent store
 	path = [[self storagePath] stringByAppendingPathComponent:permanentCacheFolder];
 	path = [[self storagePath] stringByAppendingPathComponent:permanentCacheFolder];
 	dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cachedheaders"]];
 	dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cachedheaders"]];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
+		[[self accessLock] unlock];
 		return [NSDictionary dictionaryWithContentsOfFile:dataPath];
 		return [NSDictionary dictionaryWithContentsOfFile:dataPath];
 	}
 	}
+	[[self accessLock] unlock];
 	return nil;
 	return nil;
 }
 }
 							  
 							  
@@ -167,52 +174,66 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 
 
 - (NSString *)pathToCachedResponseDataForRequest:(ASIHTTPRequest *)request
 - (NSString *)pathToCachedResponseDataForRequest:(ASIHTTPRequest *)request
 {
 {
+	[[self accessLock] lock];
 	if (![self storagePath]) {
 	if (![self storagePath]) {
+		[[self accessLock] unlock];
 		return nil;
 		return nil;
 	}
 	}
 	// Look in the session store
 	// Look in the session store
 	NSString *path = [[self storagePath] stringByAppendingPathComponent:sessionCacheFolder];
 	NSString *path = [[self storagePath] stringByAppendingPathComponent:sessionCacheFolder];
 	NSString *dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cacheddata"]];
 	NSString *dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cacheddata"]];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
+		[[self accessLock] unlock];
 		return dataPath;
 		return dataPath;
 	}
 	}
 	// Look in the permanent store
 	// Look in the permanent store
 	path = [[self storagePath] stringByAppendingPathComponent:permanentCacheFolder];
 	path = [[self storagePath] stringByAppendingPathComponent:permanentCacheFolder];
 	dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cacheddata"]];
 	dataPath = [path stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cacheddata"]];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
+		[[self accessLock] unlock];
 		return dataPath;
 		return dataPath;
 	}
 	}
+	[[self accessLock] unlock];
 	return nil;
 	return nil;
 }
 }
 
 
 - (void)removeCachedDataForRequest:(ASIHTTPRequest *)request
 - (void)removeCachedDataForRequest:(ASIHTTPRequest *)request
 {
 {
+	[[self accessLock] lock];
 	if (![self storagePath]) {
 	if (![self storagePath]) {
+		[[self accessLock] unlock];
 		return;
 		return;
 	}
 	}
 	NSString *cachedHeadersPath = [[self storagePath] stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cachedheaders"]];
 	NSString *cachedHeadersPath = [[self storagePath] stringByAppendingPathComponent:[[[self class] keyForRequest:request] stringByAppendingPathExtension:@"cachedheaders"]];
 	if (!cachedHeadersPath) {
 	if (!cachedHeadersPath) {
+		[[self accessLock] unlock];
 		return;
 		return;
 	}
 	}
 	NSString *dataPath = [self pathToCachedResponseDataForRequest:request];
 	NSString *dataPath = [self pathToCachedResponseDataForRequest:request];
 	if (!dataPath) {
 	if (!dataPath) {
+		[[self accessLock] unlock];
 		return;
 		return;
 	}
 	}
 	[[NSFileManager defaultManager] removeItemAtPath:cachedHeadersPath error:NULL];
 	[[NSFileManager defaultManager] removeItemAtPath:cachedHeadersPath error:NULL];
 	[[NSFileManager defaultManager] removeItemAtPath:dataPath error:NULL];
 	[[NSFileManager defaultManager] removeItemAtPath:dataPath error:NULL];
+	[[self accessLock] unlock];
 }
 }
 
 
 - (BOOL)isCachedDataCurrentForRequest:(ASIHTTPRequest *)request
 - (BOOL)isCachedDataCurrentForRequest:(ASIHTTPRequest *)request
 {
 {
+	[[self accessLock] lock];
 	if (![self storagePath]) {
 	if (![self storagePath]) {
+		[[self accessLock] unlock];
 		return NO;
 		return NO;
 	}
 	}
 	NSDictionary *cachedHeaders = [self cachedHeadersForRequest:request];
 	NSDictionary *cachedHeaders = [self cachedHeadersForRequest:request];
 	if (!cachedHeaders) {
 	if (!cachedHeaders) {
+		[[self accessLock] unlock];
 		return NO;
 		return NO;
 	}
 	}
 	NSString *dataPath = [self pathToCachedResponseDataForRequest:request];
 	NSString *dataPath = [self pathToCachedResponseDataForRequest:request];
 	if (!dataPath) {
 	if (!dataPath) {
+		[[self accessLock] unlock];
 		return NO;
 		return NO;
 	}
 	}
 
 
@@ -222,6 +243,7 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 		NSString *expires = [cachedHeaders objectForKey:@"Expires"];
 		NSString *expires = [cachedHeaders objectForKey:@"Expires"];
 		if (expires) {
 		if (expires) {
 			if ([[ASIHTTPRequest dateFromRFC1123String:expires] timeIntervalSinceNow] < 0) {
 			if ([[ASIHTTPRequest dateFromRFC1123String:expires] timeIntervalSinceNow] < 0) {
+				[[self accessLock] unlock];
 				return NO;
 				return NO;
 			}
 			}
 		}
 		}
@@ -242,6 +264,7 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 				#endif
 				#endif
 
 
 				if ([expiryDate timeIntervalSinceNow] < 0) {
 				if ([expiryDate timeIntervalSinceNow] < 0) {
+					[[self accessLock] unlock];
 					return NO;
 					return NO;
 				}
 				}
 			}
 			}
@@ -255,10 +278,12 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 		NSArray *headersToCompare = [NSArray arrayWithObjects:@"Etag",@"Last-Modified",nil];
 		NSArray *headersToCompare = [NSArray arrayWithObjects:@"Etag",@"Last-Modified",nil];
 		for (NSString *header in headersToCompare) {
 		for (NSString *header in headersToCompare) {
 			if (![[[request responseHeaders] objectForKey:header] isEqualToString:[cachedHeaders objectForKey:header]]) {
 			if (![[[request responseHeaders] objectForKey:header] isEqualToString:[cachedHeaders objectForKey:header]]) {
+				[[self accessLock] unlock];
 				return NO;
 				return NO;
 			}
 			}
 		}
 		}
 	}
 	}
+	[[self accessLock] unlock];
 	return YES;
 	return YES;
 }
 }
 
 
@@ -290,11 +315,13 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 	BOOL isDirectory = NO;
 	BOOL isDirectory = NO;
 	BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDirectory];
 	BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDirectory];
 	if (exists && !isDirectory || !exists) {
 	if (exists && !isDirectory || !exists) {
+		[[self accessLock] unlock];
 		return;
 		return;
 	}
 	}
 	NSError *error = nil;
 	NSError *error = nil;
 	NSArray *cacheFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:&error];
 	NSArray *cacheFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:&error];
 	if (error) {
 	if (error) {
+		[[self accessLock] unlock];
 		[NSException raise:@"FailedToTraverseCacheDirectory" format:@"Listing cache directory failed at path '%@'",path];	
 		[NSException raise:@"FailedToTraverseCacheDirectory" format:@"Listing cache directory failed at path '%@'",path];	
 	}
 	}
 	for (NSString *file in cacheFiles) {
 	for (NSString *file in cacheFiles) {
@@ -302,6 +329,7 @@ static NSDateFormatter *rfc1123DateFormatter = nil;
 		if ([extension isEqualToString:@"cacheddata"] || [extension isEqualToString:@"cachedheaders"]) {
 		if ([extension isEqualToString:@"cacheddata"] || [extension isEqualToString:@"cachedheaders"]) {
 			[[NSFileManager defaultManager] removeItemAtPath:[path stringByAppendingPathComponent:file] error:&error];
 			[[NSFileManager defaultManager] removeItemAtPath:[path stringByAppendingPathComponent:file] error:&error];
 			if (error) {
 			if (error) {
+				[[self accessLock] unlock];
 				[NSException raise:@"FailedToRemoveCacheFile" format:@"Failed to remove cached data at path '%@'",path];	
 				[NSException raise:@"FailedToRemoveCacheFile" format:@"Failed to remove cached data at path '%@'",path];	
 			}
 			}
 		}
 		}

@@ -23,7 +23,7 @@
 
 
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.6.2-18 2010-05-04";
+NSString *ASIHTTPRequestVersion = @"v1.6.2-19 2010-05-04";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -656,7 +656,6 @@ static id <ASICacheDelegate> defaultCache = nil;
 		// See if we should pull from the cache rather than fetching the data
 		// See if we should pull from the cache rather than fetching the data
 		if ([self cachePolicy] == ASIOnlyLoadIfNotCachedCachePolicy) {
 		if ([self cachePolicy] == ASIOnlyLoadIfNotCachedCachePolicy) {
 			if ([self useDataFromCache]) {
 			if ([self useDataFromCache]) {
-				[[self cancelledLock] unlock];
 				return;
 				return;
 			}
 			}
 		} else if ([self cachePolicy] == ASIReloadIfDifferentCachePolicy) {
 		} else if ([self cachePolicy] == ASIReloadIfDifferentCachePolicy) {