kopia lustrzana https://github.com/gaul/s3proxy
Explicitly add Content-Length
Previously InitiateMultipartUpload used the incorrect length. Found with s3fs integration tests. References #2.pull/29/merge
rodzic
e90074afc0
commit
71d3a67b95
|
@ -1117,7 +1117,8 @@ final class S3ProxyHandler extends AbstractHandler {
|
|||
ContentMetadata metadata = blob.getMetadata().getContentMetadata();
|
||||
BlobBuilder.PayloadBlobBuilder builder = blobStore
|
||||
.blobBuilder(destBlobName)
|
||||
.payload(is);
|
||||
.payload(is)
|
||||
.contentLength(metadata.getContentLength());
|
||||
if (replaceMetadata) {
|
||||
addContentMetdataFromHttpRequest(builder, request);
|
||||
} else {
|
||||
|
@ -1127,7 +1128,6 @@ final class S3ProxyHandler extends AbstractHandler {
|
|||
.contentType(metadata.getContentType())
|
||||
.userMetadata(blob.getMetadata().getUserMetadata());
|
||||
}
|
||||
builder.contentLength(metadata.getContentLength());
|
||||
|
||||
PutOptions options = new PutOptions()
|
||||
.multipart(forceMultiPartUpload);
|
||||
|
@ -1210,7 +1210,8 @@ final class S3ProxyHandler extends AbstractHandler {
|
|||
try (InputStream is = request.getInputStream()) {
|
||||
BlobBuilder.PayloadBlobBuilder builder = blobStore
|
||||
.blobBuilder(blobName)
|
||||
.payload(is);
|
||||
.payload(is)
|
||||
.contentLength(request.getContentLength());
|
||||
addContentMetdataFromHttpRequest(builder, request);
|
||||
if (contentMD5 != null) {
|
||||
builder = builder.contentMD5(contentMD5);
|
||||
|
@ -1582,7 +1583,8 @@ final class S3ProxyHandler extends AbstractHandler {
|
|||
request.getInputStream())) {
|
||||
BlobBuilder.PayloadBlobBuilder builder = blobStore
|
||||
.blobBuilder(uploadId + "." + partNumber)
|
||||
.payload(his);
|
||||
.payload(his)
|
||||
.contentLength(request.getContentLength());
|
||||
addContentMetdataFromHttpRequest(builder, request);
|
||||
if (contentMD5 != null) {
|
||||
builder = builder.contentMD5(contentMD5);
|
||||
|
@ -1812,7 +1814,6 @@ final class S3ProxyHandler extends AbstractHandler {
|
|||
HttpHeaders.CONTENT_ENCODING))
|
||||
.contentLanguage(request.getHeader(
|
||||
HttpHeaders.CONTENT_LANGUAGE))
|
||||
.contentLength(request.getContentLength())
|
||||
.userMetadata(userMetadata.build());
|
||||
String contentType = request.getContentType();
|
||||
if (contentType != null) {
|
||||
|
|
Ładowanie…
Reference in New Issue