From af898212e307f5e88d847d48c1f8cb5fa33b7fd8 Mon Sep 17 00:00:00 2001 From: longbai Date: Tue, 9 Dec 2014 11:36:08 +0800 Subject: [PATCH] fixed mkfile mimetype invalid --- QiniuSDK/Storage/QNResumeUpload.m | 2 +- QiniuSDK/Storage/QNUploadManager.m | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QiniuSDK/Storage/QNResumeUpload.m b/QiniuSDK/Storage/QNResumeUpload.m index 6ca8621b..fb78a301 100644 --- a/QiniuSDK/Storage/QNResumeUpload.m +++ b/QiniuSDK/Storage/QNResumeUpload.m @@ -290,7 +290,7 @@ - (void)makeFile:(NSString *)uphost mime = @""; } else { - mime = [[NSString alloc] initWithFormat:@"/mimetype/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]]; + mime = [[NSString alloc] initWithFormat:@"/mimeType/%@", [QNUrlSafeBase64 encodeString:self.option.mimeType]]; } __block NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkfile/%u%@", uphost, (unsigned int)self.size, mime]; diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m index 1a720b93..055cac42 100644 --- a/QiniuSDK/Storage/QNUploadManager.m +++ b/QiniuSDK/Storage/QNUploadManager.m @@ -105,10 +105,10 @@ - (void)putData:(NSData *)data [parameters addEntriesFromDictionary:option.params]; } - NSString *mimeType = option.mimeType; + NSString *mimeType = @"application/octet-stream"; - if (!mimeType) { - mimeType = @"application/octet-stream"; + if (option && option.mimeType) { + mimeType = option.mimeType; } if (option && option.checkCrc) {