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

Conflicts:
	AFNetworking/AFHTTPRequestOperation.m
This commit is contained in:
Mattt Thompson 2011-10-21 11:09:15 -05:00
commit e85756ff4c

View file

@ -78,7 +78,10 @@
} }
- (BOOL)hasAcceptableContentType { - (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 #pragma mark - AFHTTPClientOperation