MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-27 23:55:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #615 from harshavardhana/pr_out_use_http_timeformat_to_return_s3_expects_us_to_return_in_gmt_not_utc

Browse Source
This commit is contained in:
Harshavardhana 2015-05-25 20:18:52 -07:00
commit 92a37e5113
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/api_test.go
View File

@ -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) { func verifyHeaders(c *C, header http.Header, date time.Time, size int, contentType string, etag string) {
// Verify date // 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 // verify size
c.Assert(header.Get("Content-Length"), Equals, strconv.Itoa(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) c.Assert(header.Get("Content-Type"), Equals, contentType)
// verify etag // verify etag
c.Assert(header.Get("Etag"), Equals, etag) c.Assert(header.Get("Etag"), Equals, "\""+etag+"\"")
} }
func (s *MySuite) TestXMLNameNotInBucketListJson(c *C) { func (s *MySuite) TestXMLNameNotInBucketListJson(c *C) {

5
pkg/api/headers.go
View File

@ -22,7 +22,6 @@ import (
"encoding/xml" "encoding/xml"
"net/http" "net/http"
"strconv" "strconv"
"time"
"github.com/minio/minio/pkg/storage/drivers" "github.com/minio/minio/pkg/storage/drivers"
) )
@ -64,11 +63,11 @@ func encodeErrorResponse(response interface{}, acceptsType contentType) []byte {
// Write object header // Write object header
func setObjectHeaders(w http.ResponseWriter, metadata drivers.ObjectMetadata) { func setObjectHeaders(w http.ResponseWriter, metadata drivers.ObjectMetadata) {
lastModified := metadata.Created.Format(time.RFC1123) lastModified := metadata.Created.Format(http.TimeFormat)
// common headers // common headers
setCommonHeaders(w, metadata.ContentType, int(metadata.Size)) setCommonHeaders(w, metadata.ContentType, int(metadata.Size))
// object related headers // object related headers
w.Header().Set("ETag", metadata.Md5) w.Header().Set("ETag", "\""+metadata.Md5+"\"")
w.Header().Set("Last-Modified", lastModified) w.Header().Set("Last-Modified", lastModified)
} }