From 08a1e2e380b166d44cd2129211bacef3eb5c8bc9 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Thu, 30 Jul 2020 14:52:42 +0200 Subject: [PATCH] try to read the server response after a failed upload if the upload failed 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 Here is what happen before this patch: C->S STOR test_file1.dat S->C 150 Using transfer connection S->C 550 Could not transfer file: denying write due to space limit the client does not read the above 550 response and send the next command, so the response for the STOR response will be readed as response for the next command --- ftp.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ftp.go b/ftp.go index f8b9153..3bf0f1f 100644 --- a/ftp.go +++ b/ftp.go @@ -650,6 +650,11 @@ func (c *ServerConn) StorFrom(path string, r io.Reader, offset uint64) error { _, err = io.Copy(conn, r) conn.Close() if err != nil { + // if the upload failed 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 + c.conn.ReadResponse(StatusClosingDataConnection) return err } @@ -671,6 +676,8 @@ func (c *ServerConn) Append(path string, r io.Reader) error { _, err = io.Copy(conn, r) conn.Close() if err != nil { + // see the comment for StorFrom above + c.conn.ReadResponse(StatusClosingDataConnection) return err }