diff options
author | Daniel Stenberg <daniel@haxx.se> | 2013-10-26 20:19:27 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2013-10-26 23:33:06 +0200 |
commit | d44b0142714041b784ffd10792318674ecb1ed56 (patch) | |
tree | cad83bbb4196769983345ddf8eb310f9f39f8ca0 /lib/ftp.h | |
parent | 469b42335076b15ccfed1db411d3fadca699c39c (diff) | |
download | curl-d44b0142714041b784ffd10792318674ecb1ed56.tar.gz |
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.
Diffstat (limited to 'lib/ftp.h')
-rw-r--r-- | lib/ftp.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 */ |