Tweak persistent connection behaviour again to avoid persistent connections only…

… when they are explicitly turned off, or when we've got http1.0 and no connection:keep-alive header
canUsePersistentConnection -> connectionCanBeReused, and add public accessor
Add test for connection: close

@@ -344,7 +344,7 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
 	BOOL shouldAttemptPersistentConnection;
 	BOOL shouldAttemptPersistentConnection;
 	
 	
 	// Set to yes when an appropriate keep-alive header is found
 	// Set to yes when an appropriate keep-alive header is found
-	BOOL canUsePersistentConnection;
+	BOOL connectionCanBeReused;
 	
 	
 	// Populated with the number of seconds the server told us we could keep a persistent connection around
 	// Populated with the number of seconds the server told us we could keep a persistent connection around
 	// A future date is created from this and used for expiring the connection, this is stored in connectionInfo's expires value
 	// A future date is created from this and used for expiring the connection, this is stored in connectionInfo's expires value
@@ -717,4 +717,5 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
 @property (assign, readonly) int retryCount;
 @property (assign, readonly) int retryCount;
 @property (assign) BOOL shouldAttemptPersistentConnection;
 @property (assign) BOOL shouldAttemptPersistentConnection;
 @property (assign) BOOL shouldUseRFC2616RedirectBehaviour;
 @property (assign) BOOL shouldUseRFC2616RedirectBehaviour;
+@property (assign, readonly) BOOL connectionCanBeReused;
 @end
 @end

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.5-47 2010-02-24";
+NSString *ASIHTTPRequestVersion = @"v1.5-48 2010-02-24";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -175,7 +175,7 @@ static BOOL isiPhoneOS2;
 @property (assign) BOOL isSynchronous;
 @property (assign) BOOL isSynchronous;
 @property (assign) BOOL inProgress;
 @property (assign) BOOL inProgress;
 @property (assign) int retryCount;
 @property (assign) int retryCount;
-@property (assign) BOOL canUsePersistentConnection;
+@property (assign) BOOL connectionCanBeReused;
 @property (retain, nonatomic) NSMutableDictionary *connectionInfo;
 @property (retain, nonatomic) NSMutableDictionary *connectionInfo;
 @property (retain, nonatomic) NSInputStream *readStream;
 @property (retain, nonatomic) NSInputStream *readStream;
 @property (assign) ASIAuthenticationState authenticationNeeded;
 @property (assign) ASIAuthenticationState authenticationNeeded;
@@ -1007,7 +1007,7 @@ static BOOL isiPhoneOS2;
 	
 	
 
 
 	if (!streamSuccessfullyOpened) {
 	if (!streamSuccessfullyOpened) {
-		[self setCanUsePersistentConnection:NO];
+		[self setConnectionCanBeReused:NO];
 		[self destroyReadStream];
 		[self destroyReadStream];
 		[[self cancelledLock] unlock];
 		[[self cancelledLock] unlock];
 		[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIInternalErrorWhileBuildingRequestType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Unable to start HTTP connection",NSLocalizedDescriptionKey,nil]]];
 		[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIInternalErrorWhileBuildingRequestType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Unable to start HTTP connection",NSLocalizedDescriptionKey,nil]]];
@@ -1579,7 +1579,7 @@ static BOOL isiPhoneOS2;
 		[connectionsLock unlock];
 		[connectionsLock unlock];
 		[self destroyReadStream];
 		[self destroyReadStream];
 	}
 	}
-	if ([self canUsePersistentConnection]) {
+	if ([self connectionCanBeReused]) {
 		[[self connectionInfo] setObject:[NSDate dateWithTimeIntervalSinceNow:closeStreamTime] forKey:@"expires"];
 		[[self connectionInfo] setObject:[NSDate dateWithTimeIntervalSinceNow:closeStreamTime] forKey:@"expires"];
 	}
 	}
 	
 	
@@ -1773,35 +1773,39 @@ static BOOL isiPhoneOS2;
 		}
 		}
 		
 		
 		// Handle connection persistence
 		// Handle connection persistence
-		NSString *httpVersion = [(NSString *)CFHTTPMessageCopyVersion(message) autorelease];
-		
-		// We won't re-use this connection if this request is set to use HTTP 1.0, or the server is talking in HTTP 1.0, or persistent connections are turned off for this request
-		if (![self useHTTPVersionOne] && [self shouldAttemptPersistentConnection] && ![httpVersion isEqualToString:(NSString *)kCFHTTPVersion1_0]) {
+		if ([self shouldAttemptPersistentConnection]) {
+			
+			NSString *connectionHeader = [[[self responseHeaders] objectForKey:@"Connection"] lowercaseString];
+			NSString *httpVersion = [(NSString *)CFHTTPMessageCopyVersion(message) autorelease];
+			
+			// Don't re-use the connection if the server is HTTP 1.0 and didn't send Connection: Keep-Alive
+			if (![httpVersion isEqualToString:(NSString *)kCFHTTPVersion1_0] || [connectionHeader isEqualToString:@"keep-alive"]) {
 
 
-			// See if server explicitly told us to close the connection
-			if (![[[[self responseHeaders] objectForKey:@"Connection"] lowercaseString] isEqualToString:@"close"]) {
-				
-				NSString *keepAliveHeader = [[self responseHeaders] objectForKey:@"Keep-Alive"];
-				
-				// If we got a keep alive header, we'll reuse the connection for as long as the server tells us
-				if (keepAliveHeader) { 
-					int timeout = 0;
-					int max = 0;
-					NSScanner *scanner = [NSScanner scannerWithString:keepAliveHeader];
-					[scanner scanString:@"timeout=" intoString:NULL];
-					[scanner scanInt:&timeout];
-					[scanner scanUpToString:@"max=" intoString:NULL];
-					[scanner scanString:@"max=" intoString:NULL];
-					[scanner scanInt:&max];
-					if (max > 5) {
-						[self setCanUsePersistentConnection:YES];
-						closeStreamTime = timeout;
+				// See if server explicitly told us to close the connection
+				if (![connectionHeader isEqualToString:@"close"]) {
+					
+					NSString *keepAliveHeader = [[self responseHeaders] objectForKey:@"Keep-Alive"];
+					
+					// If we got a keep alive header, we'll reuse the connection for as long as the server tells us
+					if (keepAliveHeader) { 
+						int timeout = 0;
+						int max = 0;
+						NSScanner *scanner = [NSScanner scannerWithString:keepAliveHeader];
+						[scanner scanString:@"timeout=" intoString:NULL];
+						[scanner scanInt:&timeout];
+						[scanner scanUpToString:@"max=" intoString:NULL];
+						[scanner scanString:@"max=" intoString:NULL];
+						[scanner scanInt:&max];
+						if (max > 5) {
+							[self setConnectionCanBeReused:YES];
+							closeStreamTime = timeout;
+						}
+					
+					// Otherwise, we'll assume we can keep this connection open
+					} else {
+						[self setConnectionCanBeReused:YES];
+						closeStreamTime = 60; 
 					}
 					}
-				
-				// Otherwise, we'll assume we can keep this connection open
-				} else {
-					[self setCanUsePersistentConnection:YES];
-					closeStreamTime = 60; 
 				}
 				}
 			}
 			}
 		}
 		}
@@ -2582,7 +2586,7 @@ static BOOL isiPhoneOS2;
 
 
 	
 	
 	[connectionsLock lock];
 	[connectionsLock lock];
-	if (![self canUsePersistentConnection]) {
+	if (![self connectionCanBeReused]) {
 		[self unscheduleReadStream];
 		[self unscheduleReadStream];
 	}
 	}
 	#if DEBUG_PERSISTENT_CONNECTIONS
 	#if DEBUG_PERSISTENT_CONNECTIONS
@@ -2653,7 +2657,7 @@ static BOOL isiPhoneOS2;
 		CFReadStreamSetClient((CFReadStreamRef)[self readStream], kCFStreamEventNone, NULL, NULL);
 		CFReadStreamSetClient((CFReadStreamRef)[self readStream], kCFStreamEventNone, NULL, NULL);
 		[connectionsLock lock];		
 		[connectionsLock lock];		
 
 
-		if (![self canUsePersistentConnection]) {
+		if (![self connectionCanBeReused]) {
 			CFReadStreamUnscheduleFromRunLoop((CFReadStreamRef)[self readStream], CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
 			CFReadStreamUnscheduleFromRunLoop((CFReadStreamRef)[self readStream], CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
 			CFReadStreamClose((CFReadStreamRef)[self readStream]);
 			CFReadStreamClose((CFReadStreamRef)[self readStream]);
 			[self setReadStreamIsScheduled:NO];
 			[self setReadStreamIsScheduled:NO];
@@ -3734,7 +3738,7 @@ static BOOL isiPhoneOS2;
 @synthesize numberOfTimesToRetryOnTimeout;
 @synthesize numberOfTimesToRetryOnTimeout;
 @synthesize retryCount;
 @synthesize retryCount;
 @synthesize shouldAttemptPersistentConnection;
 @synthesize shouldAttemptPersistentConnection;
-@synthesize canUsePersistentConnection;
+@synthesize connectionCanBeReused;
 @synthesize connectionInfo;
 @synthesize connectionInfo;
 @synthesize readStream;
 @synthesize readStream;
 @synthesize readStreamIsScheduled;
 @synthesize readStreamIsScheduled;

@@ -60,4 +60,5 @@
 - (void)testReachability;
 - (void)testReachability;
 #endif
 #endif
 - (void)testAutomaticRetry;
 - (void)testAutomaticRetry;
+- (void)testCloseConnection;
 @end
 @end

@@ -1345,6 +1345,16 @@
 	
 	
 }
 }
 
 
+- (void)testCloseConnection
+{
+	ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/close-connection"]];
+	[request startSynchronous];
+	
+	BOOL success = ![request connectionCanBeReused];
+	GHAssertTrue(success,@"Should not be able to re-use a request sent with Connection:close");
+	
+}
+
 
 
 // Will be called on Mac OS
 // Will be called on Mac OS
 - (void)setDoubleValue:(double)newProgress;
 - (void)setDoubleValue:(double)newProgress;