Merge branch 'master' of https://github.com/OpenFibers/asi-http-request into OpenFibers-master

Conflicts (already fixed so discarded these):
	Classes/ASIDataCompressor.m
	Classes/ASIDataDecompressor.m
(and changed ASIS3BucketRequest.m to avoid the need to cast)

@@ -98,7 +98,7 @@
 		[queryParts addObject:[NSString stringWithFormat:@"delimiter=%@",[[self delimiter] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 		[queryParts addObject:[NSString stringWithFormat:@"delimiter=%@",[[self delimiter] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	}
 	}
 	if ([self maxResultCount] > 0) {
 	if ([self maxResultCount] > 0) {
-		[queryParts addObject:[NSString stringWithFormat:@"max-keys=%hi",[self maxResultCount]]];
+		[queryParts addObject:[NSString stringWithFormat:@"max-keys=%i",[self maxResultCount]]];
 	}
 	}
 	if ([queryParts count]) {
 	if ([queryParts count]) {
 		NSString* template = @"%@?%@";
 		NSString* template = @"%@?%@";

@@ -161,13 +161,13 @@ static void logNetworkStatus_(const char *name, int line, NetworkStatus status)
 	
 	
 	switch (status) {
 	switch (status) {
 		case kNotReachable:
 		case kNotReachable:
-			statusString = [NSString stringWithString: @"Not Reachable"];
+			statusString = @"Not Reachable";
 			break;
 			break;
 		case kReachableViaWWAN:
 		case kReachableViaWWAN:
-			statusString = [NSString stringWithString: @"Reachable via WWAN"];
+			statusString = @"Reachable via WWAN";
 			break;
 			break;
 		case kReachableViaWiFi:
 		case kReachableViaWiFi:
-			statusString = [NSString stringWithString: @"Reachable via WiFi"];
+			statusString = @"Reachable via WiFi";
 			break;
 			break;
 	}
 	}