aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Van Boghout <lists@macrabbit.com>2010-07-18 00:44:25 +0200
committerDaniel Stenberg <daniel@haxx.se>2010-07-18 00:44:25 +0200
commit4a1384a8b4c2024e3ee51938d7a9a77e76289695 (patch)
tree5624c6aa4f314c0852921add4fb83ff660cf660a
parentd76874a6651f4fcc62ddfa6fd7cfefb302bdefbe (diff)
ftp: response timeout bug in "quote" sending
The FTP implementation was missing a timestamp reset point, making the waiting for responses after sending a post-transfer "QUOTE" command not working as supposedly. This bug was introduced in 7.20.0
-rw-r--r--lib/ftp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index ac47258bc..c3de7e0bc 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -3203,6 +3203,8 @@ CURLcode ftp_sendquote(struct connectdata *conn, struct curl_slist *quote)
ssize_t nread;
int ftpcode;
CURLcode result;
+ struct ftp_conn *ftpc = &conn->proto.ftpc;
+ struct pingpong *pp = &ftpc->pp;
item = quote;
while(item) {
@@ -3222,6 +3224,8 @@ CURLcode ftp_sendquote(struct connectdata *conn, struct curl_slist *quote)
FTPSENDF(conn, "%s", cmd);
+ pp->response = Curl_tvnow(); /* timeout relative now */
+
result = Curl_GetFTPResponse(&nread, conn, &ftpcode);
if(result)
return result;