Skip to content

Commit 40f4f65

Browse files
authored
fix(ftp): handle EOF and detect content type from read bytes (#3125)
1 parent 3a31b43 commit 40f4f65

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎server/ftp/fsup.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,11 @@ func (f *FileUploadProxy) Close() error {
9494
return err
9595
}
9696
arr := make([]byte, 512)
97-
if _, err := f.buffer.Read(arr); err != nil {
97+
n, err := f.buffer.Read(arr)
98+
if err != nil && err != io.EOF {
9899
return err
99100
}
100-
contentType := http.DetectContentType(arr)
101+
contentType := http.DetectContentType(arr[:n])
101102
if _, err := f.buffer.Seek(0, io.SeekStart); err != nil {
102103
return err
103104
}

0 commit comments

Comments
 (0)