MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-13 16:03:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from fkautz/pr_out_content_type_is_now_passed_from_minioapi_to_storage

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-02-05 14:05:59 -08:00
commit 71fab1d91a
2 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/minioapi/minioapi.go
View File

@ -225,7 +225,7 @@ func writeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata)
w.Header().Set("Server", "Minio")
w.Header().Set("Last-Modified", lastModified)
w.Header().Set("Content-Length", strconv.FormatInt(metadata.Size, 10))
w.Header().Set("Content-Type", "text/plain")
w.Header().Set("Content-Type", metadata.ContentType)
w.Header().Set("Connection", "close")
}

59
pkg/api/minioapi/minioapi_test.go
View File

@ -69,7 +69,7 @@ func (s *MySuite) TestEmptyObject(c *C) {
metadata, err := storage.GetObjectMetadata("bucket", "object")
c.Assert(err, IsNil)
verifyHeaders(c, response.Header, metadata.Created, 0, "text/plain", metadata.ETag)
verifyHeaders(c, response.Header, metadata.Created, 0, "application/octet-stream", metadata.ETag)
// TODO Test Headers
}
@ -94,7 +94,7 @@ func (s *MySuite) TestObject(c *C) {
metadata, err := storage.GetObjectMetadata("bucket", "object")
c.Assert(err, IsNil)
verifyHeaders(c, response.Header, metadata.Created, len("hello world"), "text/plain", metadata.ETag)
verifyHeaders(c, response.Header, metadata.Created, len("hello world"), "application/octet-stream", metadata.ETag)
}
func (s *MySuite) TestMultipleObjects(c *C) {
@ -130,7 +130,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
c.Assert(response.StatusCode, Equals, http.StatusOK)
// verify headers
verifyHeaders(c, response.Header, metadata.Created, len("hello one"), "text/plain", metadata.ETag)
verifyHeaders(c, response.Header, metadata.Created, len("hello one"), "application/octet-stream", metadata.ETag)
c.Assert(err, IsNil)
// verify response data
@ -149,7 +149,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
c.Assert(response.StatusCode, Equals, http.StatusOK)
// verify headers
verifyHeaders(c, response.Header, metadata.Created, len("hello two"), "text/plain", metadata.ETag)
verifyHeaders(c, response.Header, metadata.Created, len("hello two"), "application/octet-stream", metadata.ETag)
c.Assert(err, IsNil)
// verify response data
@ -168,7 +168,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
c.Assert(response.StatusCode, Equals, http.StatusOK)
// verify headers
verifyHeaders(c, response.Header, metadata.Created, len("hello three"), "text/plain", metadata.ETag)
verifyHeaders(c, response.Header, metadata.Created, len("hello three"), "application/octet-stream", metadata.ETag)
c.Assert(err, IsNil)
// verify object
@ -208,7 +208,7 @@ func (s *MySuite) TestHeader(c *C) {
metadata, err := storage.GetObjectMetadata("bucket", "object")
c.Assert(err, IsNil)
verifyHeaders(c, response.Header, metadata.Created, len("hello world"), "text/plain", metadata.ETag)
verifyHeaders(c, response.Header, metadata.Created, len("hello world"), "application/octet-stream", metadata.ETag)
}
func (s *MySuite) TestPutBucket(c *C) {
@ -414,3 +414,50 @@ func (s *MySuite) TestXMLNameNotInObjectListJson(c *C) {
c.Assert(err, IsNil)
c.Assert(strings.Contains(string(byteResults), "XML"), Equals, false)
}
func (s *MySuite) TestContentTypePersists(c *C) {
_, _, storage := inmemory.Start()
httpHandler := HttpHandler(storage)
testServer := httptest.NewServer(httpHandler)
defer testServer.Close()
err := storage.StoreBucket("bucket")
c.Assert(err, IsNil)
client := http.Client{}
request, err := http.NewRequest("PUT", testServer.URL+"/bucket/one", bytes.NewBufferString("hello world"))
delete(request.Header, "Content-Type")
c.Assert(err, IsNil)
response, err := client.Do(request)
c.Assert(err, IsNil)
c.Assert(response.StatusCode, Equals, http.StatusOK)
// test head
request, err = http.NewRequest("HEAD", testServer.URL+"/bucket/one", bytes.NewBufferString(""))
c.Assert(err, IsNil)
response, err = client.Do(request)
c.Assert(err, IsNil)
c.Assert(response.Header["Content-Type"][0], Equals, "application/octet-stream")
// test get object
response, err = http.Get(testServer.URL + "/bucket/one")
c.Assert(response.Header["Content-Type"][0], Equals, "application/octet-stream")
request, err = http.NewRequest("PUT", testServer.URL+"/bucket/two", bytes.NewBufferString("hello world"))
delete(request.Header, "Content-Type")
request.Header.Add("Content-Type", "application/json")
c.Assert(err, IsNil)
response, err = client.Do(request)
c.Assert(err, IsNil)
c.Assert(response.StatusCode, Equals, http.StatusOK)
request, err = http.NewRequest("HEAD", testServer.URL+"/bucket/two", bytes.NewBufferString(""))
c.Assert(err, IsNil)
response, err = client.Do(request)
c.Assert(err, IsNil)
c.Assert(response.Header["Content-Type"][0], Equals, "application/octet-stream")
// test get object
response, err = http.Get(testServer.URL + "/bucket/two")
c.Assert(response.Header["Content-Type"][0], Equals, "application/octet-stream")
}