fix small file upload and download

sjqzhang · Sep 18, 2024 · 41f81c9 · 41f81c9
1 parent 7a4610a
commit 41f81c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/fileserver.go b/server/fileserver.go
@@ -821,7 +821,7 @@ func (c *Server) BuildFileResult(fileInfo *FileInfo, r *http.Request) FileResult
 	}
 	fileResult.Url = downloadUrl
 	if Config().DefaultDownload {
-		fileResult.Url = fmt.Sprintf("%s?name=%s&download=1", downloadUrl, url.PathEscape(outname))
+		fileResult.Url = fmt.Sprintf("%s?name=%s&download=1", downloadUrl, url.PathEscape(fileInfo.Name))
 	}
 	fileResult.Md5 = fileInfo.Md5
 	fileResult.Path = "/" + p

diff --git a/server/http_download.go b/server/http_download.go
@@ -17,12 +17,13 @@ import (
 
 func (c *Server) SetDownloadHeader(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/octet-stream")
-	w.Header().Set("Content-Disposition", "attachment")
 	if name, ok := r.URL.Query()["name"]; ok {
 		if v, err := url.QueryUnescape(name[0]); err == nil {
-			name[0] = v
+			name[0] = c.TrimFileNameSpecialChar(v)
 		}
 		w.Header().Set("Content-Disposition", fmt.Sprintf("attachment;filename=%s", name[0]))
+	} else {
+		w.Header().Set("Content-Disposition", "attachment")
 	}
 }