Merge pull request #310 from erikchen/user_agent_fix

Rename userAgent -> userAgentString

@@ -193,7 +193,7 @@ typedef void (^ASIDataBlock)(NSData *data);
 	NSString *password;
 	NSString *password;
 	
 	
 	// User-Agent for this request
 	// User-Agent for this request
-	NSString *userAgent;
+	NSString *userAgentString;
 	
 	
 	// Domain used for NTLM authentication
 	// Domain used for NTLM authentication
 	NSString *domain;
 	NSString *domain;
@@ -903,7 +903,7 @@ typedef void (^ASIDataBlock)(NSData *data);
 
 
 @property (retain) NSString *username;
 @property (retain) NSString *username;
 @property (retain) NSString *password;
 @property (retain) NSString *password;
-@property (retain) NSString *userAgent;
+@property (retain) NSString *userAgentString;
 @property (retain) NSString *domain;
 @property (retain) NSString *domain;
 
 
 @property (retain) NSString *proxyUsername;
 @property (retain) NSString *proxyUsername;

@@ -392,7 +392,7 @@ static NSOperationQueue *sharedQueue = nil;
 	[connectionInfo release];
 	[connectionInfo release];
 	[requestID release];
 	[requestID release];
 	[dataDecompressor release];
 	[dataDecompressor release];
-	[userAgent release];
+	[userAgentString release];
 
 
 	#if NS_BLOCKS_AVAILABLE
 	#if NS_BLOCKS_AVAILABLE
 	[self releaseBlocksOnMainThread];
 	[self releaseBlocksOnMainThread];
@@ -1088,12 +1088,12 @@ static NSOperationQueue *sharedQueue = nil;
 	
 	
 	// Build and set the user agent string if the request does not already have a custom user agent specified
 	// Build and set the user agent string if the request does not already have a custom user agent specified
 	if (![[self requestHeaders] objectForKey:@"User-Agent"]) {
 	if (![[self requestHeaders] objectForKey:@"User-Agent"]) {
-		NSString *userAgentString = [self userAgent];
-		if (!userAgentString) {
-			userAgentString = [ASIHTTPRequest defaultUserAgentString];
+		NSString *tempUserAgentString = [self userAgentString];
+		if (!tempUserAgentString) {
+			tempUserAgentString = [ASIHTTPRequest defaultUserAgentString];
 		}
 		}
-		if (userAgentString) {
-			[self addRequestHeader:@"User-Agent" value:userAgentString];
+		if (tempUserAgentString) {
+			[self addRequestHeader:@"User-Agent" value:tempUserAgentString];
 		}
 		}
 	}
 	}
 	
 	
@@ -4999,7 +4999,7 @@ static NSOperationQueue *sharedQueue = nil;
 
 
 @synthesize username;
 @synthesize username;
 @synthesize password;
 @synthesize password;
-@synthesize userAgent;
+@synthesize userAgentString;
 @synthesize domain;
 @synthesize domain;
 @synthesize proxyUsername;
 @synthesize proxyUsername;
 @synthesize proxyPassword;
 @synthesize proxyPassword;