diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2021-05-24 00:39:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 00:39:55 -0700 |
| commit | 15859a7daabd637cd91dede2cfc76d874e7174a4 (patch) | |
| tree | 5eb4f327c53e2525d372d19bce62984539c62e71 /weed/server/common.go | |
| parent | 359a08ecbad0b010811af367c2a2677fadfb53ae (diff) | |
| parent | 84dce32a5781268f6dbd0101e3bab65c04e0a1c7 (diff) | |
| download | seaweedfs-15859a7daabd637cd91dede2cfc76d874e7174a4.tar.xz seaweedfs-15859a7daabd637cd91dede2cfc76d874e7174a4.zip | |
Merge pull request #2074 from kmlebedev/head_check_all_chunks
avoid http error: superfluous response.WriteHeader
Diffstat (limited to 'weed/server/common.go')
| -rw-r--r-- | weed/server/common.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 7882109e5..571944c10 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -232,12 +232,12 @@ func adjustHeaderContentDisposition(w http.ResponseWriter, r *http.Request, file } } -func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64, mimeType string, writeFn func(writer io.Writer, offset int64, size int64, httpStatusCode int) error) { +func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64, mimeType string, writeFn func(writer io.Writer, offset int64, size int64) error) { rangeReq := r.Header.Get("Range") if rangeReq == "" { w.Header().Set("Content-Length", strconv.FormatInt(totalSize, 10)) - if err := writeFn(w, 0, totalSize, 0); err != nil { + if err := writeFn(w, 0, totalSize); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -277,7 +277,7 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64 w.Header().Set("Content-Length", strconv.FormatInt(ra.length, 10)) w.Header().Set("Content-Range", ra.contentRange(totalSize)) - err = writeFn(w, ra.start, ra.length, http.StatusPartialContent) + err = writeFn(w, ra.start, ra.length) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -305,7 +305,7 @@ func processRangeRequest(r *http.Request, w http.ResponseWriter, totalSize int64 pw.CloseWithError(e) return } - if e = writeFn(part, ra.start, ra.length, 0); e != nil { + if e = writeFn(part, ra.start, ra.length); e != nil { pw.CloseWithError(e) return } |