summaryrefslogtreecommitdiff
path: root/lib/ftp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-05-20 14:33:04 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-05-20 23:06:45 +0200
commitb0143a2a33f0e577b1c2c9a407ac081418b5ea6b (patch)
treeef8d61a23c8829f6cc28ecc8014753b35cc6b28e /lib/ftp.c
parent6a688976f07576ca8209dbe29fe2e93e2b41db8c (diff)
downloadcurl-b0143a2a33f0e577b1c2c9a407ac081418b5ea6b.tar.gz
read_callback: move to SessionHandle from connectdata
With many easy handles using the same connection for multiplexing, it is important we store and keep the transfer-oriented stuff in the SessionHandle so that callbacks and callback data work fine even when many easy handles share the same physical connection.
Diffstat (limited to 'lib/ftp.c')
-rw-r--r--lib/ftp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index e04f58361..de628a2dc 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1670,8 +1670,8 @@ static CURLcode ftp_state_ul_setup(struct connectdata *conn,
BUFSIZE : curlx_sotouz(data->state.resume_from - passed);
size_t actuallyread =
- conn->fread_func(data->state.buffer, 1, readthisamountnow,
- conn->fread_in);
+ data->set.fread_func(data->state.buffer, 1, readthisamountnow,
+ data->set.in);
passed += actuallyread;
if((actuallyread == 0) || (actuallyread > readthisamountnow)) {