diff options
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 4f1ca05be..31a4f4a41 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -77,7 +77,6 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request, conte if finalDestination := r.Header.Get(s3_constants.SeaweedStorageDestinationHeader); finalDestination != "" { destination = finalDestination } - query := r.URL.Query() so, err := fs.detectStorageOption0(ctx, destination, query.Get("collection"), @@ -99,7 +98,11 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request, conte } return } - + if so.TtlSeconds > 0 { + if S3expiresEnabled := r.Header.Get(s3_constants.SeaweedFSExpiresS3); S3expiresEnabled != "" { + so.TtlSeconds = 0 + } + } if util.FullPath(r.URL.Path).IsLongerFileName(so.MaxFileNameLength) { glog.V(1).InfolnCtx(ctx, "post", r.RequestURI, ": ", "entry name too long") w.WriteHeader(http.StatusRequestURITooLong) |