Improve locking behaviour

Tweak SSL test

@@ -79,8 +79,8 @@ BOOL isBandwidthThrottled = NO;
 
 
 BOOL shouldThrottleBandwithForWWANOnly = NO;
 BOOL shouldThrottleBandwithForWWANOnly = NO;
 
 
-// Mediates access to the session cookies so requests can't modify them when they are in use
-static NSLock *sessionCookiesLock = nil;
+// Mediates access to the session cookies so requests
+static NSRecursiveLock *sessionCookiesLock = nil;
 
 
 // This lock ensures delegates only receive one notification that authentication is required at once
 // This lock ensures delegates only receive one notification that authentication is required at once
 // When using ASIAuthenticationDialogs, it also ensures only one dialog is shown at once
 // When using ASIAuthenticationDialogs, it also ensures only one dialog is shown at once
@@ -141,7 +141,8 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 	if (self == [ASIHTTPRequest class]) {
 	if (self == [ASIHTTPRequest class]) {
 		progressLock = [[NSRecursiveLock alloc] init];
 		progressLock = [[NSRecursiveLock alloc] init];
 		bandwidthThrottlingLock = [[NSLock alloc] init];
 		bandwidthThrottlingLock = [[NSLock alloc] init];
-		sessionCookiesLock = [[NSLock alloc] init];
+		sessionCookiesLock = [[NSRecursiveLock alloc] init];
+		sessionCredentialsLock = [[NSRecursiveLock alloc] init];
 		delegateAuthenticationLock = [[NSRecursiveLock alloc] init];
 		delegateAuthenticationLock = [[NSRecursiveLock alloc] init];
 		bandwidthUsageTracker = [[NSMutableArray alloc] initWithCapacity:5];
 		bandwidthUsageTracker = [[NSMutableArray alloc] initWithCapacity:5];
 		ASIRequestTimedOutError = [[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIRequestTimedOutErrorType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"The request timed out",NSLocalizedDescriptionKey,nil]] retain];	
 		ASIRequestTimedOutError = [[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIRequestTimedOutErrorType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"The request timed out",NSLocalizedDescriptionKey,nil]] retain];	
@@ -2088,9 +2089,6 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 	if (!sessionProxyCredentialsStore) {
 	if (!sessionProxyCredentialsStore) {
 		sessionProxyCredentialsStore = [[NSMutableArray alloc] init];
 		sessionProxyCredentialsStore = [[NSMutableArray alloc] init];
 	}
 	}
-	if (!sessionCredentialsLock) {
-		sessionCredentialsLock = [[NSRecursiveLock alloc] init];
-	}
 	return sessionProxyCredentialsStore;
 	return sessionProxyCredentialsStore;
 }
 }
 
 
@@ -2099,9 +2097,6 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 	if (!sessionCredentialsStore) {
 	if (!sessionCredentialsStore) {
 		sessionCredentialsStore = [[NSMutableArray alloc] init];
 		sessionCredentialsStore = [[NSMutableArray alloc] init];
 	}
 	}
-	if (!sessionCredentialsLock) {
-		sessionCredentialsLock = [[NSRecursiveLock alloc] init];
-	}
 	return sessionCredentialsStore;
 	return sessionCredentialsStore;
 }
 }
 
 
@@ -2259,9 +2254,6 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 
 
 + (void)addSessionCookie:(NSHTTPCookie *)newCookie
 + (void)addSessionCookie:(NSHTTPCookie *)newCookie
 {
 {
-	// Called to ensure sessionCookies exists first, as we won't be able to create it when we have the lock
-	[[ASIHTTPRequest sessionCookies] count];
-	
 	[sessionCookiesLock lock];
 	[sessionCookiesLock lock];
 	NSHTTPCookie *cookie;
 	NSHTTPCookie *cookie;
 	int i;
 	int i;
@@ -2280,7 +2272,9 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 // Dump all session data (authentication and cookies)
 // Dump all session data (authentication and cookies)
 + (void)clearSession
 + (void)clearSession
 {
 {
+	[sessionCredentialsLock lock];
 	[[[self class] sessionCredentialsStore] removeAllObjects];
 	[[[self class] sessionCredentialsStore] removeAllObjects];
+	[sessionCredentialsLock unlock];
 	[[self class] setSessionCookies:nil];
 	[[self class] setSessionCookies:nil];
 }
 }
 
 

@@ -29,7 +29,7 @@
 - (void)testCharacterEncoding;
 - (void)testCharacterEncoding;
 - (void)testCompressedResponse;
 - (void)testCompressedResponse;
 - (void)testCompressedResponseDownloadToFile;
 - (void)testCompressedResponseDownloadToFile;
-- (void)testSSL;
+- (void)test000SSL;
 - (void)testRedirectPreservesSession;
 - (void)testRedirectPreservesSession;
 - (void)testTooMuchRedirection;
 - (void)testTooMuchRedirection;
 - (void)testRedirectToNewDomain;
 - (void)testRedirectToNewDomain;

@@ -694,13 +694,14 @@
 	GHAssertTrue(success,@"Failed to correctly display increment progress for a partial download");
 	GHAssertTrue(success,@"Failed to correctly display increment progress for a partial download");
 }
 }
 
 
-- (void)testSSL
+// The '000' is to ensure this test runs first, as another test may connect to https://selfsigned.allseeing-i.com and accept the certificate
+- (void)test000SSL
 {
 {
 	NSURL *url = [NSURL URLWithString:@"https://selfsigned.allseeing-i.com"];
 	NSURL *url = [NSURL URLWithString:@"https://selfsigned.allseeing-i.com"];
 	ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:url];
 	ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:url];
 	[request start];
 	[request start];
 	
 	
-	GHAssertNotNil([request error],@"Failed to generate an error for a self-signed certificate");		
+	GHAssertNotNil([request error],@"Failed to generate an error for a self-signed certificate (Will fail on the second run in the same session!)");		
 	
 	
 	// Just for testing the request generated a custom error description - don't do this! You should look at the domain / code of the underlyingError in your own programs.
 	// Just for testing the request generated a custom error description - don't do this! You should look at the domain / code of the underlyingError in your own programs.
 	BOOL success = ([[[request error] localizedDescription] isEqualToString:@"A connection failure occurred: SSL problem (possibily a bad/expired/self-signed certificate)"]);
 	BOOL success = ([[[request error] localizedDescription] isEqualToString:@"A connection failure occurred: SSL problem (possibily a bad/expired/self-signed certificate)"]);