Merge branch 'ignore-content-type' of https://github.com/dstnbrkr/AFNetworking into dstnbrkr-ignore-content-type

Conflicts: AFNetworking/AFHTTPRequestOperation.m
2011-10-21 11:09:15 -05:00 · 2011-10-21 11:09:15 -05:00 · e85756ff4c
commit e85756ff4c
parent c6735ffb76 256704ee96
1 changed files with 4 additions and 1 deletions
--- a/AFNetworking/AFHTTPRequestOperation.m
+++ b/AFNetworking/AFHTTPRequestOperation.m
@ -78,7 +78,10 @@
 }

 - (BOOL)hasAcceptableContentType {
-    return !self.acceptableContentTypes || [self.acceptableContentTypes containsObject:[self.response MIMEType]] || [self.response statusCode] == 204;
+    // Don't invalidate content type if there is no content
+    BOOL hasNoContent = [self.responseData length] == 0 || [self.response statusCode] == 204;
+    
+    return !self.acceptableContentTypes || [self.acceptableContentTypes containsObject:[self.response MIMEType]] || hasNoContent;
 }

 #pragma mark - AFHTTPClientOperation