KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

http: fix socket leak on 404 errors

Browse source
This commit is contained in:
Nick Craig-Wood 2019-02-08 17:40:40 +00:00
parent e62bbf761b
commit bb5ac8efbe
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/http/http.go
View file

@ -326,14 +326,16 @@ func (f *Fs) readDir(dir string) (names []string, err error) {
return nil, errors.Errorf("internal error: readDir URL %q didn't end in /", URL) return nil, errors.Errorf("internal error: readDir URL %q didn't end in /", URL)
} }
res, err := f.httpClient.Get(URL) res, err := f.httpClient.Get(URL)
if err == nil && res.StatusCode == http.StatusNotFound { if err == nil {
return nil, fs.ErrorDirNotFound defer fs.CheckClose(res.Body, &err)
if res.StatusCode == http.StatusNotFound {
return nil, fs.ErrorDirNotFound
}
} }
err = statusError(res, err) err = statusError(res, err)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to readDir") return nil, errors.Wrap(err, "failed to readDir")
} }
defer fs.CheckClose(res.Body, &err)
contentType := strings.SplitN(res.Header.Get("Content-Type"), ";", 2)[0] contentType := strings.SplitN(res.Header.Get("Content-Type"), ";", 2)[0]
switch contentType { switch contentType {