github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

🐛 close #558 fix local file can't download

pull/661/head
微凉 2022-02-18 18:50:01 +08:00
parent 192d0f2bf3
commit 977888070a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/common/proxy.go
View File

@ -24,10 +24,10 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *base.Link, file *model.
defer func() { defer func() {
_ = link.Data.Close() _ = link.Data.Close()
}() }()
w.WriteHeader(http.StatusOK)
w.Header().Set("Content-Type", "application/octet-stream") w.Header().Set("Content-Type", "application/octet-stream")
w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename=%s`, url.QueryEscape(file.Name))) w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename=%s`, url.QueryEscape(file.Name)))
w.Header().Set("Content-Length", strconv.FormatInt(file.Size, 10)) w.Header().Set("Content-Length", strconv.FormatInt(file.Size, 10))
w.WriteHeader(http.StatusOK)
_, err = io.Copy(w, link.Data) _, err = io.Copy(w, link.Data)
if err != nil { if err != nil {
return err return err
@ -47,6 +47,8 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *base.Link, file *model.
if err != nil { if err != nil {
return err return err
} }
w.Header().Set("Content-Type", "application/octet-stream")
w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename=%s`, url.QueryEscape(file.Name)))
http.ServeContent(w, r, file.Name, fileStat.ModTime(), f) http.ServeContent(w, r, file.Name, fileStat.ModTime(), f)
return nil return nil
} else { } else {
@ -68,6 +70,9 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *base.Link, file *model.
_ = res.Body.Close() _ = res.Body.Close()
}() }()
log.Debugf("proxy status: %d", res.StatusCode) log.Debugf("proxy status: %d", res.StatusCode)
for h, v := range res.Header {
w.Header()[h] = v
}
w.WriteHeader(res.StatusCode) w.WriteHeader(res.StatusCode)
if res.StatusCode >= 400 { if res.StatusCode >= 400 {
all, _ := ioutil.ReadAll(res.Body) all, _ := ioutil.ReadAll(res.Body)
@ -75,9 +80,6 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *base.Link, file *model.
log.Debugln(msg) log.Debugln(msg)
return errors.New(msg) return errors.New(msg)
} }
for h, v := range res.Header {
w.Header()[h] = v
}
_, err = io.Copy(w, res.Body) _, err = io.Copy(w, res.Body)
if err != nil { if err != nil {
return err return err