diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-04-15 21:43:28 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-04-15 21:43:28 -0700 |
| commit | bd76ad0ff1d1bb81cb77cb3417968d3b496380b4 (patch) | |
| tree | 938b52637ad99779219329d8be3fcd5bb9a2d88d | |
| parent | 359b7c16507136c927a0ca42d1ade33d142fdc44 (diff) | |
| download | seaweedfs-bd76ad0ff1d1bb81cb77cb3417968d3b496380b4.tar.xz seaweedfs-bd76ad0ff1d1bb81cb77cb3417968d3b496380b4.zip | |
Revert "Revert "volume: close request body if any parsing error""
This reverts commit 359b7c16507136c927a0ca42d1ade33d142fdc44.
| -rw-r--r-- | weed/storage/needle_parse_multipart.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/weed/storage/needle_parse_multipart.go b/weed/storage/needle_parse_multipart.go index 3dba81fcf..93b4c2dce 100644 --- a/weed/storage/needle_parse_multipart.go +++ b/weed/storage/needle_parse_multipart.go @@ -3,6 +3,7 @@ package storage import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" + "io" "io/ioutil" "mime" "net/http" @@ -13,6 +14,12 @@ import ( func parseMultipart(r *http.Request) ( fileName string, data []byte, mimeType string, isGzipped bool, originalDataSize int, isChunkedFile bool, e error) { + defer func() { + if e != nil && r.Body != nil { + io.Copy(ioutil.Discard, r.Body) + r.Body.Close() + } + }() form, fe := r.MultipartReader() if fe != nil { glog.V(0).Infoln("MultipartReader [ERROR]", fe) |