From b6af9aa587a6305dd2eeb1847a7d398c6e579464 Mon Sep 17 00:00:00 2001 From: foxxorcat Date: Tue, 10 May 2022 21:35:42 +0800 Subject: [PATCH] fix(139,189,189pc,alidrive,onedrive,yandex):http response body is not close #1072 --- drivers/139/driver.go | 1 + drivers/189/189.go | 1 + drivers/189pc/driver.go | 4 ++++ drivers/alidrive/driver.go | 1 + drivers/onedrive/onedrive.go | 2 ++ drivers/yandex/driver.go | 3 ++- 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/139/driver.go b/drivers/139/driver.go index b0025fcc..8864787c 100644 --- a/drivers/139/driver.go +++ b/drivers/139/driver.go @@ -448,6 +448,7 @@ func (driver Cloud139) Upload(file *model.FileStream, account *model.Account) er return err } log.Debugf("%+v", res) + res.Body.Close() start += byteSize } return nil diff --git a/drivers/189/189.go b/drivers/189/189.go index f921a749..ac6ea189 100644 --- a/drivers/189/189.go +++ b/drivers/189/189.go @@ -577,6 +577,7 @@ func (driver Cloud189) NewUpload(file *model.FileStream, account *model.Account) r, err := base.HttpClient.Do(req) log.Debugf("%+v %+v", r, r.Request.Header) + r.Body.Close() if err != nil { return err } diff --git a/drivers/189pc/driver.go b/drivers/189pc/driver.go index b6ca7a1b..22b6edeb 100644 --- a/drivers/189pc/driver.go +++ b/drivers/189pc/driver.go @@ -619,8 +619,10 @@ func (driver Cloud189) CommonUpload(file *model.FileStream, parentFile *model.Fi } if r.StatusCode != http.StatusOK { data, _ := io.ReadAll(r.Body) + r.Body.Close() return fmt.Errorf(string(data)) } + r.Body.Close() } fileMd5Hex := strings.ToUpper(hex.EncodeToString(fileMd5.Sum(nil))) @@ -727,8 +729,10 @@ func (driver Cloud189) FastUpload(file *model.FileStream, parentFile *model.File } if r.StatusCode != http.StatusOK { data, _ := io.ReadAll(r.Body) + r.Body.Close() return fmt.Errorf(string(data)) } + r.Body.Close() } } diff --git a/drivers/alidrive/driver.go b/drivers/alidrive/driver.go index 9ad81566..f695abf6 100644 --- a/drivers/alidrive/driver.go +++ b/drivers/alidrive/driver.go @@ -515,6 +515,7 @@ func (driver AliDrive) Upload(file *model.FileStream, account *model.Account) er return err } log.Debugf("%+v", res) + res.Body.Close() //res, err := base.BaseClient.R(). // SetHeader("Content-Type",""). // SetBody(byteData).Put(resp.PartInfoList[i].UploadUrl) diff --git a/drivers/onedrive/onedrive.go b/drivers/onedrive/onedrive.go index 7e4efc71..77bc38ea 100644 --- a/drivers/onedrive/onedrive.go +++ b/drivers/onedrive/onedrive.go @@ -307,8 +307,10 @@ func (driver Onedrive) UploadBig(file *model.FileStream, account *model.Account) res, err := base.HttpClient.Do(req) if res.StatusCode != 201 && res.StatusCode != 202 { data, _ := ioutil.ReadAll(res.Body) + res.Body.Close() return errors.New(string(data)) } + res.Body.Close() } return nil } diff --git a/drivers/yandex/driver.go b/drivers/yandex/driver.go index 3957fec9..5edc5500 100644 --- a/drivers/yandex/driver.go +++ b/drivers/yandex/driver.go @@ -213,7 +213,8 @@ func (driver Yandex) Upload(file *model.FileStream, account *model.Account) erro } req.Header.Set("Content-Length", strconv.FormatUint(file.Size, 10)) req.Header.Set("Content-Type", "application/octet-stream") - _, err = base.HttpClient.Do(req) + res, err := base.HttpClient.Do(req) + res.Body.Close() //res, err := base.RestyClient.R(). // SetHeader("Content-Length", strconv.FormatUint(file.Size, 10)). // SetBody(file).Put(resp.Href)