Added the ability to set the default timeout

Tweak locking behaviour for session credentials

@@ -506,6 +506,11 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
 // Called automatically when a request is started to clean up any persistent connections that have expired
 // Called automatically when a request is started to clean up any persistent connections that have expired
 + (void)expirePersistentConnections;
 + (void)expirePersistentConnections;
 
 
+#pragma mark default time out
+
++ (NSTimeInterval)defaultTimeOutSeconds;
++ (void)setDefaultTimeOutSeconds:(NSTimeInterval)newTimeOutSeconds;
+
 #pragma mark session credentials
 #pragma mark session credentials
 
 
 + (NSMutableArray *)sessionProxyCredentialsStore;
 + (NSMutableArray *)sessionProxyCredentialsStore;

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.5-42 2010-02-03";
+NSString *ASIHTTPRequestVersion = @"v1.5-43 2010-02-04";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -40,6 +40,9 @@ static NSMutableArray *sessionCookies = nil;
 // The number of times we will allow requests to redirect before we fail with a redirection error
 // The number of times we will allow requests to redirect before we fail with a redirection error
 const int RedirectionLimit = 5;
 const int RedirectionLimit = 5;
 
 
+// The default number of seconds to use for a timeout
+static NSTimeInterval defaultTimeOutSeconds = 10;
+
 static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventType type, void *clientCallBackInfo) {
 static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventType type, void *clientCallBackInfo) {
     [((ASIHTTPRequest*)clientCallBackInfo) handleNetworkEvent: type];
     [((ASIHTTPRequest*)clientCallBackInfo) handleNetworkEvent: type];
 }
 }
@@ -227,7 +230,7 @@ static BOOL isiPhoneOS2;
 	[self setDefaultResponseEncoding:NSISOLatin1StringEncoding];
 	[self setDefaultResponseEncoding:NSISOLatin1StringEncoding];
 	[self setShouldPresentProxyAuthenticationDialog:YES];
 	[self setShouldPresentProxyAuthenticationDialog:YES];
 	
 	
-	[self setTimeOutSeconds:10];
+	[self setTimeOutSeconds:[ASIHTTPRequest defaultTimeOutSeconds]];
 	[self setUseSessionPersistance:YES];
 	[self setUseSessionPersistance:YES];
 	[self setUseCookiePersistance:YES];
 	[self setUseCookiePersistance:YES];
 	[self setValidatesSecureCertificate:YES];
 	[self setValidatesSecureCertificate:YES];
@@ -2733,21 +2736,37 @@ static BOOL isiPhoneOS2;
 	return newRequest;
 	return newRequest;
 }
 }
 
 
+#pragma mark default time out
+
++ (NSTimeInterval)defaultTimeOutSeconds
+{
+	return defaultTimeOutSeconds;
+}
+
++ (void)setDefaultTimeOutSeconds:(NSTimeInterval)newTimeOutSeconds
+{
+	defaultTimeOutSeconds = newTimeOutSeconds;
+}
+
 #pragma mark session credentials
 #pragma mark session credentials
 
 
 + (NSMutableArray *)sessionProxyCredentialsStore
 + (NSMutableArray *)sessionProxyCredentialsStore
 {
 {
+	[sessionCredentialsLock lock];
 	if (!sessionProxyCredentialsStore) {
 	if (!sessionProxyCredentialsStore) {
 		sessionProxyCredentialsStore = [[NSMutableArray alloc] init];
 		sessionProxyCredentialsStore = [[NSMutableArray alloc] init];
 	}
 	}
+	[sessionCredentialsLock unlock];
 	return sessionProxyCredentialsStore;
 	return sessionProxyCredentialsStore;
 }
 }
 
 
 + (NSMutableArray *)sessionCredentialsStore
 + (NSMutableArray *)sessionCredentialsStore
 {
 {
+	[sessionCredentialsLock lock];
 	if (!sessionCredentialsStore) {
 	if (!sessionCredentialsStore) {
 		sessionCredentialsStore = [[NSMutableArray alloc] init];
 		sessionCredentialsStore = [[NSMutableArray alloc] init];
 	}
 	}
+	[sessionCredentialsLock unlock];
 	return sessionCredentialsStore;
 	return sessionCredentialsStore;
 }
 }
 
 

@@ -242,6 +242,14 @@
 	
 	
 	BOOL success = [[request error] code] == ASIRequestTimedOutErrorType;
 	BOOL success = [[request error] code] == ASIRequestTimedOutErrorType;
 	GHAssertTrue(success,@"Timeout didn't generate the correct error");
 	GHAssertTrue(success,@"Timeout didn't generate the correct error");
+	
+	[ASIHTTPRequest setDefaultTimeOutSeconds:0.0001];
+	[request startSynchronous];
+	
+	success = [[request error] code] == ASIRequestTimedOutErrorType;
+	GHAssertTrue(success,@"Failed to change the default timeout");	
+	
+	[ASIHTTPRequest setDefaultTimeOutSeconds:10];
 }
 }