From e46660a966889cc9846e25c491ce54caeca59dd2 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 25 May 2015 20:10:01 -0700 Subject: [PATCH] Use http.TimeFormat to return, S3 expects us to return in GMT not UTC --- pkg/api/api_test.go | 4 ++-- pkg/api/headers.go | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go index 4df663514..b0cd0a23d 100644 --- a/pkg/api/api_test.go +++ b/pkg/api/api_test.go @@ -894,7 +894,7 @@ func (s *MySuite) TestDateFormat(c *C) { func verifyHeaders(c *C, header http.Header, date time.Time, size int, contentType string, etag string) { // Verify date - c.Assert(header.Get("Last-Modified"), Equals, date.Format(time.RFC1123)) + c.Assert(header.Get("Last-Modified"), Equals, date.Format(http.TimeFormat)) // verify size c.Assert(header.Get("Content-Length"), Equals, strconv.Itoa(size)) @@ -903,7 +903,7 @@ func verifyHeaders(c *C, header http.Header, date time.Time, size int, contentTy c.Assert(header.Get("Content-Type"), Equals, contentType) // verify etag - c.Assert(header.Get("Etag"), Equals, etag) + c.Assert(header.Get("Etag"), Equals, "\""+etag+"\"") } func (s *MySuite) TestXMLNameNotInBucketListJson(c *C) { diff --git a/pkg/api/headers.go b/pkg/api/headers.go index a80ded041..934e03c3f 100644 --- a/pkg/api/headers.go +++ b/pkg/api/headers.go @@ -22,7 +22,6 @@ import ( "encoding/xml" "net/http" "strconv" - "time" "github.com/minio/minio/pkg/storage/drivers" ) @@ -64,11 +63,11 @@ func encodeErrorResponse(response interface{}, acceptsType contentType) []byte { // Write object header func setObjectHeaders(w http.ResponseWriter, metadata drivers.ObjectMetadata) { - lastModified := metadata.Created.Format(time.RFC1123) + lastModified := metadata.Created.Format(http.TimeFormat) // common headers setCommonHeaders(w, metadata.ContentType, int(metadata.Size)) // object related headers - w.Header().Set("ETag", metadata.Md5) + w.Header().Set("ETag", "\""+metadata.Md5+"\"") w.Header().Set("Last-Modified", lastModified) }