diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-11-01 15:17:35 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-11-01 15:18:38 +0100 |
commit | 6323b0729a27f312ba8cce6279de68181644823e (patch) | |
tree | ef8c9d816d66cf69107d1f45c493f0ac0084d076 /src/libstore/s3-binary-cache-store.cc | |
parent | fc59fe029bc026e72e3978a0628e8c91484dafb5 (diff) |
Disable the S3 content-encoding patch
Since we're not using multi-part uploads at the moment, we can drop
this patch.
Diffstat (limited to 'src/libstore/s3-binary-cache-store.cc')
-rw-r--r-- | src/libstore/s3-binary-cache-store.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 1f755ba9e..4f1e23198 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -292,11 +292,14 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore if (transferManager) { + if (contentEncoding != "") + throw Error("setting a content encoding is not supported with S3 multi-part uploads"); + std::shared_ptr<TransferHandle> transferHandle = transferManager->UploadFile( stream, bucketName, path, mimeType, Aws::Map<Aws::String, Aws::String>(), - nullptr, contentEncoding); + nullptr /*, contentEncoding */); transferHandle->WaitUntilFinished(); |