Skip to content

修正了通过request.MetaData().addHeader设置协议头后put时无效的问题 #132

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修正了通过request.MetaData().addHeader设置协议头后put时无效的问题 #132

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
4 changes: 3 additions & 1 deletion sdk/include/alibabacloud/oss/model/UploadPartRequest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#pragma once
#include <alibabacloud/oss/Export.h>
#include <alibabacloud/oss/OssRequest.h>
#include <alibabacloud/oss/model/ObjectMetaData.h>
#include <sstream>
#include <iostream>

Expand All @@ -32,7 +33,7 @@ namespace OSS
const std::shared_ptr<std::iostream>& content);
UploadPartRequest(const std::string &bucket, const std::string& key,
int partNumber, const std::string& uploadId,
const std::shared_ptr<std::iostream>& content);
const std::shared_ptr<std::iostream>& content, const ObjectMetaData& metaData);
virtual std::shared_ptr<std::iostream> Body() const;
void setPartNumber(int partNumber);
void setUploadId(const std::string& uploadId);
Expand All @@ -57,6 +58,7 @@ namespace OSS
std::string userAgent_;
std::string contentMd5_;
bool contentMd5IsSet_;
ObjectMetaData metaData_;
};
}
}
11 changes: 7 additions & 4 deletions sdk/src/model/UploadPartRequest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,22 @@ using namespace AlibabaCloud::OSS;

UploadPartRequest::UploadPartRequest(const std::string &bucket, const std::string &key,
const std::shared_ptr<std::iostream> &content) :
UploadPartRequest(bucket, key, 0, "", content)
UploadPartRequest(bucket, key, 0, "", content, ObjectMetaData())
{
}

UploadPartRequest::UploadPartRequest(const std::string &bucket, const std::string &key,
int partNumber, const std::string &uploadId,
const std::shared_ptr<std::iostream> &content) :
const std::shared_ptr<std::iostream> &content, const ObjectMetaData& metaData) :
OssObjectRequest(bucket, key),
partNumber_(partNumber),
uploadId_(uploadId),
content_(content),
contentLengthIsSet_(false),
trafficLimit_(0),
userAgent_(),
contentMd5IsSet_(false)
contentMd5IsSet_(false),
metaData_(metaData)
{
setFlags(Flags() | REQUEST_FLAG_CHECK_CRC64);
}
Expand Down Expand Up @@ -96,7 +97,9 @@ std::shared_ptr<std::iostream> UploadPartRequest::Body() const

HeaderCollection UploadPartRequest::specialHeaders() const
{
auto headers = OssObjectRequest::specialHeaders();
auto headers = metaData_.toHeaderCollection();
auto baseHeaders = OssObjectRequest::specialHeaders();
headers.insert(baseHeaders.begin(), baseHeaders.end());
headers[Http::CONTENT_TYPE] = "";
if (contentLengthIsSet_) {
headers[Http::CONTENT_LENGTH] = std::to_string(contentLength_);
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/resumable/ResumableUploader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ PutObjectOutcome ResumableUploader::Upload()
std::ios::in | std::ios::binary);
content->seekg(offset, content->beg);

UploadPartRequest uploadPartRequest(request_.Bucket(), request_.Key(), part.PartNumber(), uploadID_, content);
UploadPartRequest uploadPartRequest(request_.Bucket(), request_.Key(), part.PartNumber(), uploadID_, content, request_.MetaData());
uploadPartRequest.setContentLength(length);

UploaderTransferState transferState;
Expand Down