Skip to content

fixed mkfile mimetype invalid #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2014
Merged

fixed mkfile mimetype invalid #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion QiniuSDK/Storage/QNResumeUpload.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
6 changes: 3 additions & 3 deletions QiniuSDK/Storage/QNUploadManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down