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/socks.c | |
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/socks.c')
-rw-r--r-- | lib/socks.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/socks.c b/lib/socks.c index b101a0de4..d7136c605 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -129,6 +129,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name, curlx_nonblock(sock, FALSE); + infof(data, "SOCKS4 communication to %s:%d\n", hostname, remote_port); + /* * Compose socks4 request * @@ -182,6 +184,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name, else hp = NULL; /* fail! */ + infof(data, "SOCKS4 connect to %s (locally resolved)\n", buf); + Curl_resolv_unlock(data, dns); /* not used anymore from now on */ } |