From b3625ebcd0ca889a52602b92e071aaf9253359f3 Mon Sep 17 00:00:00 2001 From: Steven Fisher Date: Thu, 7 Feb 2013 14:19:54 -0800 Subject: [PATCH 1/2] Fixed comment typo Minor typo. --- AFNetworking/AFHTTPClient.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index e2fd452..c990e13 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -1165,7 +1165,7 @@ typedef enum { } - (BOOL)hasBytesAvailable { - // Allows `read:maxLength:` to be called again if `AFMultipartFormFinalBoundary` doesn't fit into the avaiable buffer + // Allows `read:maxLength:` to be called again if `AFMultipartFormFinalBoundary` doesn't fit into the available buffer if (_phase == AFFinalBoundaryPhase) { return YES; } From a563b61a347f7aa0ea7757fcc37f23ad77f1778d Mon Sep 17 00:00:00 2001 From: Zach Waugh Date: Sat, 9 Feb 2013 11:49:06 -0500 Subject: [PATCH 2/2] Ensure content type for path extension doesn't return null --- AFNetworking/AFHTTPClient.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index c990e13..d745143 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -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