aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorHoward Chu <hyc@highlandsun.com>2010-05-11 22:48:38 +0200
committerDaniel Stenberg <daniel@haxx.se>2010-05-11 22:48:38 +0200
commitbc8fc9803fbd0fa9daf0dba796d42d03faf49120 (patch)
treeedd313accc3ad85ef2b4826f5ffa9e335da86ebd /lib/url.c
parent016ce4b1daa0f8d44a0da7105e1e1c97531e8b87 (diff)
sendrecv: make them two pairs of send/recv to properly deal with FTPS
FTP(S) use two connections that can be set to different recv and send functions independently, so by introducing recv+send pairs in the same manner we already have sockets/connections we can work with FTPS fine. This commit fixes the FTPS regression introduced in change d64bd82.
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/url.c b/lib/url.c
index c41db0a7c..ec7f46a3e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4754,8 +4754,10 @@ static CURLcode create_conn(struct SessionHandle *data,
return result;
}
- conn->recv = Curl_recv_plain;
- conn->send = Curl_send_plain;
+ conn->recv[FIRSTSOCKET] = Curl_recv_plain;
+ conn->send[FIRSTSOCKET] = Curl_send_plain;
+ conn->recv[SECONDARYSOCKET] = Curl_recv_plain;
+ conn->send[SECONDARYSOCKET] = Curl_send_plain;
/***********************************************************************
* file: is a special case in that it doesn't need a network connection