From 240570664312916ed66946b9a758e7a09b41104a Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 23 Jul 2023 16:17:34 +0900 Subject: [PATCH] Insert SSE headers when appropriate (#2228) References #2218. References #2227. --- src/curl.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/curl.cpp b/src/curl.cpp index bd1ae84..4471c18 100644 --- a/src/curl.cpp +++ b/src/curl.cpp @@ -3839,12 +3839,7 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s }else if(key == "x-amz-server-side-encryption-aws-kms-key-id"){ // skip this header, because this header is specified after logic. }else if(key == "x-amz-server-side-encryption-customer-key-md5"){ - // Only copy mode. - if(is_copy){ - if(!AddSseRequestHead(sse_type_t::SSE_C, value, true)){ - S3FS_PRN_WARN("Failed to insert SSE-C header."); - } - } + // skip this header, because this header is specified after logic. } } // "x-amz-acl", storage class, sse @@ -3965,6 +3960,13 @@ int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, const std::string& requestHeaders = curl_slist_sort_insert(requestHeaders, "Accept", NULL); requestHeaders = curl_slist_sort_insert(requestHeaders, "Content-Type", contype.c_str()); + if(sse_type_t::SSE_C == S3fsCurl::GetSseType()){ + std::string ssevalue; + if(!AddSseRequestHead(S3fsCurl::GetSseType(), ssevalue, false)){ + S3FS_PRN_WARN("Failed to set SSE header, but continue..."); + } + } + op = "POST"; type = REQTYPE_COMPLETEMULTIPOST;