|
|
@ -159,9 +159,10 @@ func putOpts(ctx context.Context, r *http.Request, bucket, object string, metada |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
mtime := strings.TrimSpace(r.Header.Get(xhttp.MinIOSourceMTime)) |
|
|
|
mtimeStr := strings.TrimSpace(r.Header.Get(xhttp.MinIOSourceMTime)) |
|
|
|
if mtime != "" { |
|
|
|
var mtime time.Time |
|
|
|
opts.MTime, err = time.Parse(time.RFC3339, mtime) |
|
|
|
if mtimeStr != "" { |
|
|
|
|
|
|
|
mtime, err = time.Parse(time.RFC3339, mtimeStr) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return opts, InvalidArgument{ |
|
|
|
return opts, InvalidArgument{ |
|
|
|
Bucket: bucket, |
|
|
|
Bucket: bucket, |
|
|
@ -170,7 +171,7 @@ func putOpts(ctx context.Context, r *http.Request, bucket, object string, metada |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
opts.MTime = UTCNow() |
|
|
|
mtime = UTCNow() |
|
|
|
} |
|
|
|
} |
|
|
|
etag := strings.TrimSpace(r.Header.Get(xhttp.MinIOSourceETag)) |
|
|
|
etag := strings.TrimSpace(r.Header.Get(xhttp.MinIOSourceETag)) |
|
|
|
if etag != "" { |
|
|
|
if etag != "" { |
|
|
@ -187,6 +188,7 @@ func putOpts(ctx context.Context, r *http.Request, bucket, object string, metada |
|
|
|
UserDefined: metadata, |
|
|
|
UserDefined: metadata, |
|
|
|
VersionID: vid, |
|
|
|
VersionID: vid, |
|
|
|
Versioned: versioned, |
|
|
|
Versioned: versioned, |
|
|
|
|
|
|
|
MTime: mtime, |
|
|
|
}, nil |
|
|
|
}, nil |
|
|
|
} |
|
|
|
} |
|
|
|
if GlobalGatewaySSE.SSEC() && crypto.SSEC.IsRequested(r.Header) { |
|
|
|
if GlobalGatewaySSE.SSEC() && crypto.SSEC.IsRequested(r.Header) { |
|
|
@ -210,6 +212,7 @@ func putOpts(ctx context.Context, r *http.Request, bucket, object string, metada |
|
|
|
UserDefined: metadata, |
|
|
|
UserDefined: metadata, |
|
|
|
VersionID: vid, |
|
|
|
VersionID: vid, |
|
|
|
Versioned: versioned, |
|
|
|
Versioned: versioned, |
|
|
|
|
|
|
|
MTime: mtime, |
|
|
|
}, nil |
|
|
|
}, nil |
|
|
|
} |
|
|
|
} |
|
|
|
// default case of passing encryption headers and UserDefined metadata to backend
|
|
|
|
// default case of passing encryption headers and UserDefined metadata to backend
|
|
|
@ -219,6 +222,7 @@ func putOpts(ctx context.Context, r *http.Request, bucket, object string, metada |
|
|
|
} |
|
|
|
} |
|
|
|
opts.VersionID = vid |
|
|
|
opts.VersionID = vid |
|
|
|
opts.Versioned = versioned |
|
|
|
opts.Versioned = versioned |
|
|
|
|
|
|
|
opts.MTime = mtime |
|
|
|
return opts, nil |
|
|
|
return opts, nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|