Merge branch 'master' of github.com:pokeb/asi-http-request

Conflicts: Classes/ASIHTTPRequest.m
gamma · Aug 20, 2011 · 1a57f92 · 1a57f92
2 parents 762c38c + 1a7ae81
commit 1a57f92
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/Classes/ASIInputStream.m b/Classes/ASIInputStream.m
@@ -58,9 +58,11 @@ - (NSInteger)read:(uint8_t *)buffer maxLength:(NSUInteger)len
 		}
 		[request performThrottling];
 	}
-	[ASIHTTPRequest incrementBandwidthUsedInLastSecond:toRead];
 	[readLock unlock];
-	return [stream read:buffer maxLength:toRead];
+	NSInteger rv = [stream read:buffer maxLength:toRead];
+	if (rv > 0)
+		[ASIHTTPRequest incrementBandwidthUsedInLastSecond:rv];
+	return rv;
 }
 
 /*

diff --git a/Classes/CloudFiles/ASICloudFilesCDNRequest.h b/Classes/CloudFiles/ASICloudFilesCDNRequest.h
@@ -24,10 +24,12 @@
 // Response:
 // X-CDN-Enabled: True
 // X-CDN-URI: http://cdn.cloudfiles.mosso.com/c1234
+// X-CDN-SSL-URI: https://cdn.ssl.cloudfiles.mosso.com/c1234
 // X-CDN-TTL: 86400
 + (id)containerInfoRequest:(NSString *)containerName;
 - (BOOL)cdnEnabled;
 - (NSString *)cdnURI;
+- (NSString *)cdnSSLURI;
 - (NSUInteger)cdnTTL;
 
 

diff --git a/Classes/CloudFiles/ASICloudFilesCDNRequest.m b/Classes/CloudFiles/ASICloudFilesCDNRequest.m
@@ -38,15 +38,35 @@ + (id)containerInfoRequest:(NSString *)containerName {
 }
 
 - (BOOL)cdnEnabled {
-	return [[[self responseHeaders] objectForKey:@"X-Cdn-Enabled"] boolValue];
+    NSNumber *enabled = [[self responseHeaders] objectForKey:@"X-CDN-Enabled"];
+    if (!enabled) {
+        enabled = [[self responseHeaders] objectForKey:@"X-Cdn-Enabled"];
+    }
+	return [enabled boolValue];
 }
 
 - (NSString *)cdnURI {
-	return [[self responseHeaders] objectForKey:@"X-Cdn-Uri"];
+	NSString *uri = [[self responseHeaders] objectForKey:@"X-CDN-URI"];
+    if (!uri) {
+        uri = [[self responseHeaders] objectForKey:@"X-Cdn-Uri"];
+    }
+    return uri;
+}
+
+- (NSString *)cdnSSLURI {
+    NSString *uri = [[self responseHeaders] objectForKey:@"X-CDN-SSL-URI"];
+    if (!uri) {
+        uri = [[self responseHeaders] objectForKey:@"X-Cdn-Ssl-Uri"];
+    }
+	return uri;
 }
 
 - (NSUInteger)cdnTTL {
-	return [[[self responseHeaders] objectForKey:@"X-Ttl"] intValue];
+    NSNumber *ttl = [[self responseHeaders] objectForKey:@"X-TTL"];
+    if (!ttl) {
+        ttl = [[self responseHeaders] objectForKey:@"X-Ttl"];
+    }
+    return [ttl intValue];
 }
 
 #pragma mark -
@@ -130,7 +150,7 @@ + (id)postRequestWithContainer:(NSString *)containerName cdnEnabled:(BOOL)cdnEna
 	if (ttl > 0) {
 		[request addRequestHeader:@"X-Ttl" value:[NSString stringWithFormat:@"%i", ttl]];
 	}
-	[request addRequestHeader:@"X-Cdn-Enabled" value:cdnEnabled ? @"True" : @"False"];
+	[request addRequestHeader:@"X-CDN-Enabled" value:cdnEnabled ? @"True" : @"False"];
 	return request;
 }
 

diff --git a/Classes/CloudFiles/ASICloudFilesObjectRequest.m b/Classes/CloudFiles/ASICloudFilesObjectRequest.m
@@ -130,7 +130,7 @@ - (ASICloudFilesObject *)object {
 	object.bytes = [[[self responseHeaders] objectForKey:@"Content-Length"] intValue];
 	object.contentType = [[self responseHeaders] objectForKey:@"Content-Type"];
 	object.lastModified = [[self responseHeaders] objectForKey:@"Last-Modified"];
-	object.metadata = [[NSMutableDictionary alloc] init];
+	object.metadata = [NSMutableDictionary dictionary];
 
 	for (NSString *key in [[self responseHeaders] keyEnumerator]) {
 		NSRange metaRange = [key rangeOfString:@"X-Object-Meta-"];

diff --git a/Classes/CloudFiles/ASICloudFilesRequest.m b/Classes/CloudFiles/ASICloudFilesRequest.m
@@ -69,7 +69,13 @@ + (NSError *)authenticate
 		NSDictionary *responseHeaders = [request responseHeaders];
 		authToken = [responseHeaders objectForKey:@"X-Auth-Token"];
 		storageURL = [responseHeaders objectForKey:@"X-Storage-Url"];
-		cdnManagementURL = [responseHeaders objectForKey:@"X-Cdn-Management-Url"];
+		cdnManagementURL = [responseHeaders objectForKey:@"X-CDN-Management-Url"];
+
+        // there is a bug in the Cloud Files API for some older accounts that causes
+        // the CDN URL to come back in a slightly different header
+        if (!cdnManagementURL) {
+            cdnManagementURL = [responseHeaders objectForKey:@"X-Cdn-Management-Url"];
+        }
 	}
 	[accessDetailsLock unlock];
 	return [request error];