From d44b0142714041b784ffd10792318674ecb1ed56 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 26 Oct 2013 20:19:27 +0200 Subject: FTP: make the data connection work when going through proxy This is a regression since the switch to always-multi internally c43127414d89c. Test 1316 was modified since we now clearly call the Curl_client_write() function when doing the LIST transfer part and then the handler->protocol says FTP and ftpc.transfertype is 'A' which implies text converting even though that the response is initially a HTTP CONNECT response in this case. --- lib/ftp.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/ftp.h') diff --git a/lib/ftp.h b/lib/ftp.h index bdd59c93d..b6bfc0287 100644 --- a/lib/ftp.h +++ b/lib/ftp.h @@ -147,6 +147,12 @@ struct ftp_conn { curl_off_t known_filesize; /* file size is different from -1, if wildcard LIST parsing was done and wc_statemach set it */ + /* newhost must be able to hold a full IP-style address in ASCII, which + in the IPv6 case means 5*8-1 = 39 letters */ +#define NEWHOST_BUFSIZE 48 + char newhost[NEWHOST_BUFSIZE]; /* this is the pair to connect the DATA... */ + unsigned short newport; /* connection to */ + }; #define DEFAULT_ACCEPT_TIMEOUT 60000 /* milliseconds == one minute */ -- cgit v1.2.3