octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 09:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set Content-MD5 header even for empty objects

Browse Source 
The Content-MD5 header is required for any request to upload an object
with a retention period configured using Amazon S3 Object Lock
This commit is contained in:
Dmitrii Vasilev 2021-06-18 21:29:26 +02:00 committed by Andrew Gaul
parent 1e0e2752bf
commit b9ce0faee2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/curl.cpp
View File

@ -41,6 +41,7 @@
// Symbols // Symbols
//------------------------------------------------------------------- //-------------------------------------------------------------------
static const std::string empty_payload_hash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; static const std::string empty_payload_hash = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
static const std::string empty_md5_base64_hash = "1B2M2Y8AsgTpgAmY7PhCfg==";
//------------------------------------------------------------------- //-------------------------------------------------------------------
// Class S3fsCurl // Class S3fsCurl
@ -3210,12 +3211,16 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd)
// Make request headers // Make request headers
std::string strMD5; std::string strMD5;
if(-1 != fd && S3fsCurl::is_content_md5){ if(S3fsCurl::is_content_md5){
if(-1 != fd){
strMD5 = s3fs_get_content_md5(fd); strMD5 = s3fs_get_content_md5(fd);
if(0 == strMD5.length()){ if(0 == strMD5.length()){
S3FS_PRN_ERR("Failed to make MD5."); S3FS_PRN_ERR("Failed to make MD5.");
return -EIO; return -EIO;
} }
}else{
strMD5 = empty_md5_base64_hash;
}
requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-MD5", strMD5.c_str()); requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-MD5", strMD5.c_str());
} }