MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 12:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

allow non-standards fallback for all http.TimeFormats (#15662)

Browse Source 
fixes #15645
This commit is contained in:
Harshavardhana
2022-09-07 07:24:54 -07:00
committed by GitHub
parent 52861d3aea
commit 228c6686f8
8 changed files with 153 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/erasure-metadata.go
View File

@@ -26,6 +26,7 @@ import (
"strings"
"time"
"github.com/minio/minio/internal/amztime"
"github.com/minio/minio/internal/bucket/replication"
"github.com/minio/minio/internal/hash/sha256"
xhttp "github.com/minio/minio/internal/http"
@@ -127,17 +128,8 @@ func (fi FileInfo) ToObjectInfo(bucket, object string, versioned bool) ObjectInf
SuccessorModTime: fi.SuccessorModTime,
}
// Update expires
var (
t time.Time
e error
)
const nonStandardHTTPTimeFormat = "Mon, 2 Jan 2006 15:04:05 GMT"
if exp, ok := fi.Metadata["expires"]; ok {
if t, e = time.Parse(http.TimeFormat, exp); e == nil {
objInfo.Expires = t.UTC()
} else if t, e = time.Parse(nonStandardHTTPTimeFormat, exp); e == nil {
if t, err := amztime.ParseHeader(exp); err == nil {
objInfo.Expires = t.UTC()
}
}