aboutsummaryrefslogtreecommitdiff
path: root/weed/server
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-07-25 20:09:19 -0700
committerChris Lu <chris.lu@gmail.com>2020-07-25 20:09:19 -0700
commit3faa0aa4482fbac89f090b0efef920f4ce84776e (patch)
treee340a1d981ea274bfb6035bf6af1b4091f612388 /weed/server
parent023a1efdf2b05a9e1595e9f95e5919a829d3fea7 (diff)
downloadseaweedfs-3faa0aa4482fbac89f090b0efef920f4ce84776e.tar.xz
seaweedfs-3faa0aa4482fbac89f090b0efef920f4ce84776e.zip
rename
Diffstat (limited to 'weed/server')
-rw-r--r--weed/server/common.go2
-rw-r--r--weed/server/filer_server_handlers_read.go2
-rw-r--r--weed/server/volume_server_handlers_read.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/common.go b/weed/server/common.go
index 7fc4d45f3..75fc3ad9e 100644
--- a/weed/server/common.go
+++ b/weed/server/common.go
@@ -218,7 +218,7 @@ func handleStaticResources2(r *mux.Router) {
r.PathPrefix("/seaweedfsstatic/").Handler(http.StripPrefix("/seaweedfsstatic", http.FileServer(statikFS)))
}
-func adjustHeaders(w http.ResponseWriter, r *http.Request, filename string) {
+func adjustHeaderContentDisposition(w http.ResponseWriter, r *http.Request, filename string) {
if filename != "" {
contentDisposition := "inline"
if r.FormValue("dl") != "" {
diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go
index aef490ff4..657158c2f 100644
--- a/weed/server/filer_server_handlers_read.go
+++ b/weed/server/filer_server_handlers_read.go
@@ -102,7 +102,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request,
setEtag(w, etag)
filename := entry.Name()
- adjustHeaders(w, r, filename)
+ adjustHeaderContentDisposition(w, r, filename)
if r.Method == "HEAD" {
w.Header().Set("Content-Length", strconv.FormatInt(int64(filer2.TotalSize(entry.Chunks)), 10))
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go
index 1d1e0f1bb..89b7445e9 100644
--- a/weed/server/volume_server_handlers_read.go
+++ b/weed/server/volume_server_handlers_read.go
@@ -244,7 +244,7 @@ func writeResponseContent(filename, mimeType string, rs io.ReadSeeker, w http.Re
}
w.Header().Set("Accept-Ranges", "bytes")
- adjustHeaders(w, r, filename)
+ adjustHeaderContentDisposition(w, r, filename)
if r.Method == "HEAD" {
w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10))