Merge branch 'master' into newgzipstuff

Also add missing files to iPhone project

Conflicts:
	Classes/ASIHTTPRequest.m

 build
 build
+*xcodeproj/*mode*
+*xcodeproj/*pbxuser
+*xcodeproj/*per*
+*xcodeproj/project.xcworkspace
+*xcodeproj/xcuserdata
+*tmproj
+.DS_Store
+profile
 *.pbxuser
 *.pbxuser
 *.mode1v3
 *.mode1v3
-.DS_Store

@@ -24,7 +24,7 @@
 #import "ASIDataCompressor.h"
 #import "ASIDataCompressor.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.7-44 2010-08-18";
+NSString *ASIHTTPRequestVersion = @"v1.7-45 2010-08-18";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -366,7 +366,6 @@ static NSOperationQueue *sharedQueue = nil;
 	[super dealloc];
 	[super dealloc];
 }
 }
 
 
-
 #pragma mark setup request
 #pragma mark setup request
 
 
 - (void)addRequestHeader:(NSString *)header value:(NSString *)value
 - (void)addRequestHeader:(NSString *)header value:(NSString *)value
@@ -1069,7 +1068,7 @@ static NSOperationQueue *sharedQueue = nil;
 			// Check if we should have expired this connection
 			// Check if we should have expired this connection
 			} else if ([[[self connectionInfo] objectForKey:@"expires"] timeIntervalSinceNow] < 0) {
 			} else if ([[[self connectionInfo] objectForKey:@"expires"] timeIntervalSinceNow] < 0) {
 				#if DEBUG_PERSISTENT_CONNECTIONS
 				#if DEBUG_PERSISTENT_CONNECTIONS
-				NSLog(@"Not re-using connection #%hi because it has expired",[[[self connectionInfo] objectForKey:@"id"] intValue]);
+				NSLog(@"Not re-using connection #%i because it has expired",[[[self connectionInfo] objectForKey:@"id"] intValue]);
 				#endif
 				#endif
 				[persistentConnectionsPool removeObject:[self connectionInfo]];
 				[persistentConnectionsPool removeObject:[self connectionInfo]];
 				[self setConnectionInfo:nil];
 				[self setConnectionInfo:nil];
@@ -1114,7 +1113,7 @@ static NSOperationQueue *sharedQueue = nil;
 		CFReadStreamSetProperty((CFReadStreamRef)[self readStream],  kCFStreamPropertyHTTPAttemptPersistentConnection, kCFBooleanTrue);
 		CFReadStreamSetProperty((CFReadStreamRef)[self readStream],  kCFStreamPropertyHTTPAttemptPersistentConnection, kCFBooleanTrue);
 		
 		
 		#if DEBUG_PERSISTENT_CONNECTIONS
 		#if DEBUG_PERSISTENT_CONNECTIONS
-		NSLog(@"Request #%@ will use connection #%hi",[self requestID],[[[self connectionInfo] objectForKey:@"id"] intValue]);
+		NSLog(@"Request #%@ will use connection #%i",[self requestID],[[[self connectionInfo] objectForKey:@"id"] intValue]);
 		#endif
 		#endif
 		
 		
 		
 		
@@ -1869,7 +1868,7 @@ static NSOperationQueue *sharedQueue = nil;
 			[self setRequestCookies:[NSMutableArray array]];
 			[self setRequestCookies:[NSMutableArray array]];
 			
 			
 			#if DEBUG_REQUEST_STATUS
 			#if DEBUG_REQUEST_STATUS
-				NSLog(@"Request will redirect (code: %hi): %@",[self responseStatusCode],self);
+				NSLog(@"Request will redirect (code: %i): %@",[self responseStatusCode],self);
 			#endif
 			#endif
 			
 			
 		}
 		}
@@ -2766,7 +2765,7 @@ static NSOperationQueue *sharedQueue = nil;
 {	
 {	
 
 
 #if DEBUG_REQUEST_STATUS
 #if DEBUG_REQUEST_STATUS
-	NSLog(@"Request %@ finished downloading data",self);
+	NSLog(@"Request %@ finished downloading data (%qu bytes)",self, [self totalBytesRead]);
 #endif
 #endif
 	
 	
 	[self setDownloadComplete:YES];
 	[self setDownloadComplete:YES];
@@ -3183,7 +3182,7 @@ static NSOperationQueue *sharedQueue = nil;
 		NSDictionary *existingConnection = [persistentConnectionsPool objectAtIndex:i];
 		NSDictionary *existingConnection = [persistentConnectionsPool objectAtIndex:i];
 		if (![existingConnection objectForKey:@"request"] && [[existingConnection objectForKey:@"expires"] timeIntervalSinceNow] <= 0) {
 		if (![existingConnection objectForKey:@"request"] && [[existingConnection objectForKey:@"expires"] timeIntervalSinceNow] <= 0) {
 #if DEBUG_PERSISTENT_CONNECTIONS
 #if DEBUG_PERSISTENT_CONNECTIONS
-			NSLog(@"Closing connection #%hi because it has expired",[[existingConnection objectForKey:@"id"] intValue]);
+			NSLog(@"Closing connection #%i because it has expired",[[existingConnection objectForKey:@"id"] intValue]);
 #endif
 #endif
 			NSInputStream *stream = [existingConnection objectForKey:@"stream"];
 			NSInputStream *stream = [existingConnection objectForKey:@"stream"];
 			if (stream) {
 			if (stream) {
@@ -3476,8 +3475,8 @@ static NSOperationQueue *sharedQueue = nil;
 
 
 + (NSString *)defaultUserAgentString
 + (NSString *)defaultUserAgentString
 {
 {
-	NSBundle *bundle = [NSBundle mainBundle];
-	
+	NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+
 	// Attempt to find a name for this application
 	// Attempt to find a name for this application
 	NSString *appName = [bundle objectForInfoDictionaryKey:@"CFBundleDisplayName"];
 	NSString *appName = [bundle objectForInfoDictionaryKey:@"CFBundleDisplayName"];
 	if (!appName) {
 	if (!appName) {

@@ -2,6 +2,7 @@ ASIHTTPRequest donors:
 
 
 Stephan Burlot (http://www.coriolis.ch)
 Stephan Burlot (http://www.coriolis.ch)
 Jack Cardinal (http://www.intomotion.com)
 Jack Cardinal (http://www.intomotion.com)
+Wonki Chung
 Matt Coneybeare (http://urbanapps.com)
 Matt Coneybeare (http://urbanapps.com)
 Connected Bits LLC (http://www.connectedbits.com)
 Connected Bits LLC (http://www.connectedbits.com)
 Nathan de Vries (http://www.atnan.com)
 Nathan de Vries (http://www.atnan.com)