Merge pull request #792 from zachwaugh/master

Fix content type for extension from returning null
This commit is contained in:
Mattt Thompson 2013-02-09 09:44:40 -08:00
commit 284b95006e

View file

@ -742,7 +742,12 @@ static inline NSString * AFMultipartFormFinalBoundary() {
static inline NSString * AFContentTypeForPathExtension(NSString *extension) {
#ifdef __UTTYPE__
NSString *UTI = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)extension, NULL);
return (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)UTI, kUTTagClassMIMEType);
NSString *contentType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)UTI, kUTTagClassMIMEType);
if (!contentType) {
return @"application/octet-stream";
} else {
return contentType;
}
#else
return @"application/octet-stream";
#endif