aboutsummaryrefslogtreecommitdiff
path: root/weed/server
diff options
context:
space:
mode:
authorruitao.liu <ruitao.liu@cloudminds.com>2020-10-29 14:57:19 +0800
committerruitao.liu <ruitao.liu@cloudminds.com>2020-10-29 14:57:19 +0800
commitb917be79559ec171f351ac842f9d4c20bb335e41 (patch)
tree9f5a814bec92823e4552f9396c51cfc19394861e /weed/server
parent2dcc178d0ae20a013a901e4b4472dc9d8843ba59 (diff)
downloadseaweedfs-b917be79559ec171f351ac842f9d4c20bb335e41.tar.xz
seaweedfs-b917be79559ec171f351ac842f9d4c20bb335e41.zip
S3 bucket list, response with uploaded storageclass.
Diffstat (limited to 'weed/server')
-rw-r--r--weed/server/filer_server_handlers_read.go4
-rw-r--r--weed/server/filer_server_handlers_write_autochunk.go15
2 files changed, 7 insertions, 12 deletions
diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go
index 16edb6167..42d540df8 100644
--- a/weed/server/filer_server_handlers_read.go
+++ b/weed/server/filer_server_handlers_read.go
@@ -97,12 +97,12 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request,
if r.Method == "GET" {
tagCount := 0
for k, _ := range entry.Extended {
- if strings.HasPrefix(k, "X-Amz-Tagging-") {
+ if strings.HasPrefix(k, util.AmzObjectTagging+"-") {
tagCount++
}
}
if tagCount > 0 {
- w.Header().Set("x-amz-tag-count", strconv.Itoa(tagCount))
+ w.Header().Set(util.AmzTagCount, strconv.Itoa(tagCount))
}
}
diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go
index d996c6208..5396cc5ca 100644
--- a/weed/server/filer_server_handlers_write_autochunk.go
+++ b/weed/server/filer_server_handlers_write_autochunk.go
@@ -312,31 +312,26 @@ func (fs *FilerServer) mkdir(ctx context.Context, w http.ResponseWriter, r *http
}
func (fs *FilerServer) saveAmzMetaData(r *http.Request, entry *filer.Entry) {
- var (
- storageClass = "X-Amz-Storage-Class"
- objectTagging = "X-Amz-Tagging"
- userMetaPrefix = "X-Amz-Meta-"
- )
if entry.Extended == nil {
entry.Extended = make(map[string][]byte)
}
- if sc := r.Header.Get(storageClass); sc != "" {
- entry.Extended[storageClass] = []byte(sc)
+ if sc := r.Header.Get(util.AmzStorageClass); sc != "" {
+ entry.Extended[util.AmzStorageClass] = []byte(sc)
}
- if tags := r.Header.Get(objectTagging); tags != "" {
+ if tags := r.Header.Get(util.AmzObjectTagging); tags != "" {
for _, v := range strings.Split(tags, "&") {
tag := strings.Split(v, "=")
if len(tag) == 2 {
- entry.Extended[objectTagging+"-"+tag[0]] = []byte(tag[1])
+ entry.Extended[util.AmzObjectTagging+"-"+tag[0]] = []byte(tag[1])
}
}
}
for header, values := range r.Header {
- if strings.HasPrefix(header, userMetaPrefix) {
+ if strings.HasPrefix(header, util.AmzUserMetaPrefix) {
for _, value := range values {
entry.Extended[header] = []byte(value)
}