mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Explicitly add Content-Length 

Previously InitiateMultipartUpload used the incorrect length.  Found
with s3fs integration tests.  References #2.
pull/29/merge
Andrew Gaul 2015-03-02 17:00:41 -08:00
rodzic e90074afc0
commit 71d3a67b95
1 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -1117,7 +1117,8 @@ final class S3ProxyHandler extends AbstractHandler {
ContentMetadata metadata = blob.getMetadata().getContentMetadata(); ContentMetadata metadata = blob.getMetadata().getContentMetadata();
BlobBuilder.PayloadBlobBuilder builder = blobStore BlobBuilder.PayloadBlobBuilder builder = blobStore
.blobBuilder(destBlobName) .blobBuilder(destBlobName)
.payload(is); .payload(is)
.contentLength(metadata.getContentLength());
if (replaceMetadata) { if (replaceMetadata) {
addContentMetdataFromHttpRequest(builder, request); addContentMetdataFromHttpRequest(builder, request);
} else { } else {
@ -1127,7 +1128,6 @@ final class S3ProxyHandler extends AbstractHandler {
.contentType(metadata.getContentType()) .contentType(metadata.getContentType())
.userMetadata(blob.getMetadata().getUserMetadata()); .userMetadata(blob.getMetadata().getUserMetadata());
} }
builder.contentLength(metadata.getContentLength());
PutOptions options = new PutOptions() PutOptions options = new PutOptions()
.multipart(forceMultiPartUpload); .multipart(forceMultiPartUpload);
@ -1210,7 +1210,8 @@ final class S3ProxyHandler extends AbstractHandler {
try (InputStream is = request.getInputStream()) { try (InputStream is = request.getInputStream()) {
BlobBuilder.PayloadBlobBuilder builder = blobStore BlobBuilder.PayloadBlobBuilder builder = blobStore
.blobBuilder(blobName) .blobBuilder(blobName)
.payload(is); .payload(is)
.contentLength(request.getContentLength());
addContentMetdataFromHttpRequest(builder, request); addContentMetdataFromHttpRequest(builder, request);
if (contentMD5 != null) { if (contentMD5 != null) {
builder = builder.contentMD5(contentMD5); builder = builder.contentMD5(contentMD5);
@ -1582,7 +1583,8 @@ final class S3ProxyHandler extends AbstractHandler {
request.getInputStream())) { request.getInputStream())) {
BlobBuilder.PayloadBlobBuilder builder = blobStore BlobBuilder.PayloadBlobBuilder builder = blobStore
.blobBuilder(uploadId + "." + partNumber) .blobBuilder(uploadId + "." + partNumber)
.payload(his); .payload(his)
.contentLength(request.getContentLength());
addContentMetdataFromHttpRequest(builder, request); addContentMetdataFromHttpRequest(builder, request);
if (contentMD5 != null) { if (contentMD5 != null) {
builder = builder.contentMD5(contentMD5); builder = builder.contentMD5(contentMD5);
@ -1812,7 +1814,6 @@ final class S3ProxyHandler extends AbstractHandler {
HttpHeaders.CONTENT_ENCODING)) HttpHeaders.CONTENT_ENCODING))
.contentLanguage(request.getHeader( .contentLanguage(request.getHeader(
HttpHeaders.CONTENT_LANGUAGE)) HttpHeaders.CONTENT_LANGUAGE))
.contentLength(request.getContentLength())
.userMetadata(userMetadata.build()); .userMetadata(userMetadata.build());
String contentType = request.getContentType(); String contentType = request.getContentType();
if (contentType != null) { if (contentType != null) {