fix: support zero-byte uploads in FilePut

Reading the body into a zero-length buffer returned io.EOF on an
already-exhausted reader, so empty files and directory markers always
failed. Use io.ReadFull and send an explicit Content-Length: 0 for
empty bodies instead of falling back to chunked encoding. Also fix an
error variable mix-up in the NewRequest error check.
This commit is contained in:
ys-ll
2026-09-30 16:18:31 +08:00
parent 9210db974c
commit 3357c14e91
2 changed files with 57 additions and 3 deletions
+11 -3
View File
@@ -157,16 +157,24 @@ func (s3 *S3) FilePut(u UploadInput) (PutResponse, error) {
}
content := make([]byte, fSize)
_, err = u.Body.Read(content)
// io.ReadFull succeeds for a zero-length read (empty body) and reports
// ErrUnexpectedEOF if the body is shorter than its size, unlike a bare
// Read which returns io.EOF on an already-exhausted reader.
_, err = io.ReadFull(u.Body, content)
if err != nil {
return PutResponse{}, err
}
u.Body.Seek(0, 0)
req, er := http.NewRequest(http.MethodPut, s3.getURL(u.Bucket, u.ObjectKey), u.Body)
if er != nil {
req, err := http.NewRequest(http.MethodPut, s3.getURL(u.Bucket, u.ObjectKey), u.Body)
if err != nil {
return PutResponse{}, err
}
// A non-nil empty body makes net/http fall back to chunked encoding and
// omit Content-Length; nil body sends a clean "Content-Length: 0".
if fSize == 0 {
req.Body = nil
}
if u.ContentType == "" {
u.ContentType = "application/octet-stream"