Disable the S3 content-encoding patch

Since we're not using multi-part uploads at the moment, we can drop
this patch.

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 1f755ba9eee7..4f1e23198ffe 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();