From c95eff4a11575a5973fad20619ff7ca3989316db Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 15 Aug 2017 18:48:04 +0200 Subject: ftp: fix CWD when doing multicwd then nocwd on same connection Fixes #1782 Closes #1787 Reported-by: Peter Lamare --- lib/ftp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/ftp.c') diff --git a/lib/ftp.c b/lib/ftp.c index 481b14a88..06c196462 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3197,6 +3197,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, size_t flen = ftpc->file?strlen(ftpc->file):0; /* file is "raw" already */ size_t dlen = strlen(path)-flen; if(!ftpc->cwdfail) { + ftpc->prevmethod = data->set.ftp_filemethod; if(dlen && (data->set.ftp_filemethod != FTPFILE_NOCWD)) { ftpc->prevpath = path; if(flen) @@ -4305,7 +4306,8 @@ CURLcode ftp_parse_url_path(struct connectdata *conn) dlen -= ftpc->file?strlen(ftpc->file):0; if((dlen == strlen(ftpc->prevpath)) && - !strncmp(path, ftpc->prevpath, dlen)) { + !strncmp(path, ftpc->prevpath, dlen) && + (ftpc->prevmethod == data->set.ftp_filemethod)) { infof(data, "Request has same path as previous transfer\n"); ftpc->cwddone = TRUE; } -- cgit v1.2.3