Merge pull request #792 from zachwaugh/master
Fix content type for extension from returning null
This commit is contained in:
commit
284b95006e
1 changed files with 6 additions and 1 deletions
|
|
@ -742,7 +742,12 @@ static inline NSString * AFMultipartFormFinalBoundary() {
|
||||||
static inline NSString * AFContentTypeForPathExtension(NSString *extension) {
|
static inline NSString * AFContentTypeForPathExtension(NSString *extension) {
|
||||||
#ifdef __UTTYPE__
|
#ifdef __UTTYPE__
|
||||||
NSString *UTI = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)extension, NULL);
|
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
|
#else
|
||||||
return @"application/octet-stream";
|
return @"application/octet-stream";
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue