brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #192 from drakkan/resp_error

Browse Source 
try to read the server response after a failed upload
This commit is contained in:
Julien Laffaye 2020-08-12 10:35:50 -04:00 committed by GitHub
commit 39e3779af0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ftp.go
View File

@ -657,11 +657,14 @@ func (c *ServerConn) StorFrom(path string, r io.Reader, offset uint64) error {
return err
}
_, err = io.Copy(conn, r)
// if the upload fails we still need to try to read the server
// response otherwise if the failure is not due to a connection problem,
// for example the server denied the upload for quota limits, we miss
// the response and we cannot use the connection to send other commands.
// So we don't check io.Copy error and we return the error from
// ReadResponse so the user can see the real error
io.Copy(conn, r)
conn.Close()
if err != nil {
return err
}
_, _, err = c.conn.ReadResponse(StatusClosingDataConnection)
return err
@ -678,11 +681,9 @@ func (c *ServerConn) Append(path string, r io.Reader) error {
return err
}
_, err = io.Copy(conn, r)
// see the comment for StorFrom above
io.Copy(conn, r)
conn.Close()
if err != nil {
return err
}
_, _, err = c.conn.ReadResponse(StatusClosingDataConnection)
return err