Browse Source

chunk rememober encryption or not

pull/1298/head
Chris Lu 5 years ago
parent
commit
d57559d3f7
  1. 1
      weed/filer2/filer_notify_append.go
  2. 1
      weed/s3api/filer_multipart.go

1
weed/filer2/filer_notify_append.go

@ -44,6 +44,7 @@ func (f *Filer) appendToFile(targetFile string, data []byte) error {
Size: uint64(uploadResult.Size), Size: uint64(uploadResult.Size),
Mtime: time.Now().UnixNano(), Mtime: time.Now().UnixNano(),
ETag: uploadResult.ETag, ETag: uploadResult.ETag,
CipherKey: uploadResult.CipherKey,
IsGzipped: uploadResult.Gzip > 0, IsGzipped: uploadResult.Gzip > 0,
} }
entry.Chunks = append(entry.Chunks, chunk) entry.Chunks = append(entry.Chunks, chunk)

1
weed/s3api/filer_multipart.go

@ -73,6 +73,7 @@ func (s3a *S3ApiServer) completeMultipartUpload(input *s3.CompleteMultipartUploa
Offset: offset, Offset: offset,
Size: chunk.Size, Size: chunk.Size,
Mtime: chunk.Mtime, Mtime: chunk.Mtime,
CipherKey: chunk.CipherKey,
ETag: chunk.ETag, ETag: chunk.ETag,
} }
finalParts = append(finalParts, p) finalParts = append(finalParts, p)

Loading…
Cancel
Save