admin/alist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ftp): dead lock on Read (close #5128)

Browse Source
This commit is contained in:
Andy Hsu 2023-08-31 15:10:47 +08:00
parent cb8867fcc1
commit 34fadecc2c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ftp/util.go
View File

@ -48,10 +48,9 @@ func NewFTPFileReader(conn *ftp.ServerConn, path string) *FTPFileReader {
} }
func (r *FTPFileReader) Read(buf []byte) (n int, err error) { func (r *FTPFileReader) Read(buf []byte) (n int, err error) {
n, err = r.ReadAt(buf, r.offset)
r.mu.Lock() r.mu.Lock()
defer r.mu.Unlock() defer r.mu.Unlock()
n, err = r.ReadAt(buf, r.offset)
r.offset += int64(n) r.offset += int64(n)
return return
} }

9
server/common/proxy.go
View File

@ -3,20 +3,21 @@ package common
import ( import (
"context" "context"
"fmt" "fmt"
"io"
"net/http"
"net/url"
"github.com/alist-org/alist/v3/internal/model" "github.com/alist-org/alist/v3/internal/model"
"github.com/alist-org/alist/v3/internal/net" "github.com/alist-org/alist/v3/internal/net"
"github.com/alist-org/alist/v3/pkg/http_range" "github.com/alist-org/alist/v3/pkg/http_range"
"github.com/alist-org/alist/v3/pkg/utils" "github.com/alist-org/alist/v3/pkg/utils"
"io"
"net/http"
"net/url"
) )
func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.Obj) error { func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.Obj) error {
if link.MFile != nil { if link.MFile != nil {
defer link.MFile.Close()
attachFileName(w, file) attachFileName(w, file)
http.ServeContent(w, r, file.GetName(), file.ModTime(), link.MFile) http.ServeContent(w, r, file.GetName(), file.ModTime(), link.MFile)
defer link.MFile.Close()
return nil return nil
} else if link.RangeReadCloser != nil { } else if link.RangeReadCloser != nil {
attachFileName(w, file) attachFileName(w, file)