|
|
@ -1272,7 +1272,6 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req |
|
|
|
|
|
|
|
|
|
|
|
if objectAPI.IsEncryptionSupported() { |
|
|
|
if objectAPI.IsEncryptionSupported() { |
|
|
|
if crypto.IsEncrypted(objInfo.UserDefined) { |
|
|
|
if crypto.IsEncrypted(objInfo.UserDefined) { |
|
|
|
objInfo.Size, _ = objInfo.DecryptedSize() |
|
|
|
|
|
|
|
switch { |
|
|
|
switch { |
|
|
|
case crypto.S3.IsEncrypted(objInfo.UserDefined): |
|
|
|
case crypto.S3.IsEncrypted(objInfo.UserDefined): |
|
|
|
w.Header().Set(crypto.SSEHeader, crypto.SSEAlgorithmAES256) |
|
|
|
w.Header().Set(crypto.SSEHeader, crypto.SSEAlgorithmAES256) |
|
|
@ -2337,13 +2336,6 @@ func (api objectAPIHandlers) CompleteMultipartUploadHandler(w http.ResponseWrite |
|
|
|
// Write success response.
|
|
|
|
// Write success response.
|
|
|
|
writeSuccessResponseXML(w, encodedSuccessResponse) |
|
|
|
writeSuccessResponseXML(w, encodedSuccessResponse) |
|
|
|
|
|
|
|
|
|
|
|
// Get host and port from Request.RemoteAddr.
|
|
|
|
|
|
|
|
if objectAPI.IsEncryptionSupported() { |
|
|
|
|
|
|
|
if crypto.IsEncrypted(objInfo.UserDefined) { |
|
|
|
|
|
|
|
objInfo.Size, _ = objInfo.DecryptedSize() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Notify object created event.
|
|
|
|
// Notify object created event.
|
|
|
|
sendEvent(eventArgs{ |
|
|
|
sendEvent(eventArgs{ |
|
|
|
EventName: event.ObjectCreatedCompleteMultipartUpload, |
|
|
|
EventName: event.ObjectCreatedCompleteMultipartUpload, |
|
|
|