From 1318be3b0a24818ee93686d4c83b194444706d6a Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Sun, 17 Mar 2019 09:30:57 +0000 Subject: [PATCH] vendor: update github.com/goftp/server to fix hang while reading a file from the server See: https://forum.rclone.org/t/minor-issue-with-linux-ftp-client-and-rclone-ftp-access-denied/8959 --- go.mod | 6 +++--- go.sum | 2 ++ vendor/github.com/goftp/server/cmd.go | 3 +++ vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 7169dcdc2..21354b01e 100644 --- a/go.mod +++ b/go.mod @@ -17,16 +17,16 @@ require ( github.com/djherbis/times v1.2.0 github.com/dropbox/dropbox-sdk-go-unofficial v5.4.0+incompatible github.com/goftp/file-driver v0.0.0-20180502053751-5d604a0fc0c9 // indirect - github.com/goftp/server v0.0.0-20190111142836-88de73f463af + github.com/goftp/server v0.0.0-20190304020633-eabccc535b5a github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jlaffaye/ftp v0.0.0-20190126081051-8019e6774408 github.com/jtolds/gls v4.2.1+incompatible // indirect github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect - github.com/koofr/go-httpclient v0.0.0-20180104120329-03786175608a // indirect + github.com/koofr/go-httpclient v0.0.0-20180104120329-03786175608a github.com/koofr/go-koofrclient v0.0.0-20190131164641-7f327592caff github.com/kr/fs v0.1.0 // indirect - github.com/mattn/go-runewidth v0.0.4 // indirect + github.com/mattn/go-runewidth v0.0.4 github.com/ncw/go-acd v0.0.0-20171120105400-887eb06ab6a2 github.com/ncw/swift v1.0.44 github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d diff --git a/go.sum b/go.sum index 1e0072fe1..63c59d11c 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/goftp/file-driver v0.0.0-20180502053751-5d604a0fc0c9 h1:cC0Hbb+18DJ4i github.com/goftp/file-driver v0.0.0-20180502053751-5d604a0fc0c9/go.mod h1:GpOj6zuVBG3Inr9qjEnuVTgBlk2lZ1S9DcoFiXWyKss= github.com/goftp/server v0.0.0-20190111142836-88de73f463af h1:PJxb1aA1z+Ohy2j28L92+ng9phXpZVFRFbPkfmJcRGo= github.com/goftp/server v0.0.0-20190111142836-88de73f463af/go.mod h1:k/SS6VWkxY7dHPhoMQ8IdRu8L4lQtmGbhyXGg+vCnXE= +github.com/goftp/server v0.0.0-20190304020633-eabccc535b5a h1:XTJuuzIub3zu2FgPqdFM9XFYYisXWu2hN/rFwayAIcY= +github.com/goftp/server v0.0.0-20190304020633-eabccc535b5a/go.mod h1:k/SS6VWkxY7dHPhoMQ8IdRu8L4lQtmGbhyXGg+vCnXE= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= diff --git a/vendor/github.com/goftp/server/cmd.go b/vendor/github.com/goftp/server/cmd.go index 6cc622706..edff10592 100644 --- a/vendor/github.com/goftp/server/cmd.go +++ b/vendor/github.com/goftp/server/cmd.go @@ -698,6 +698,9 @@ func (cmd commandRetr) Execute(conn *Conn, param string) { defer data.Close() conn.writeMessage(150, fmt.Sprintf("Data transfer starting %v bytes", bytes)) err = conn.sendOutofBandDataWriter(data) + if err != nil { + conn.writeMessage(551, "Error reading file") + } } else { conn.writeMessage(551, "File not available") } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5fa5a732c..636e0a4a8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -84,7 +84,7 @@ github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/seen_state github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/team_common github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/team_policies github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/users_common -# github.com/goftp/server v0.0.0-20190111142836-88de73f463af +# github.com/goftp/server v0.0.0-20190304020633-eabccc535b5a github.com/goftp/server # github.com/golang/protobuf v1.2.0 github.com/golang/protobuf/proto