diff options
author | Daniel Stenberg <daniel@haxx.se> | 2015-05-20 14:33:04 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2015-05-20 23:06:45 +0200 |
commit | b0143a2a33f0e577b1c2c9a407ac081418b5ea6b (patch) | |
tree | ef8d61a23c8829f6cc28ecc8014753b35cc6b28e /lib/transfer.c | |
parent | 6a688976f07576ca8209dbe29fe2e93e2b41db8c (diff) | |
download | curl-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/transfer.c')
-rw-r--r-- | lib/transfer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 7671730f5..42d38b51a 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -115,8 +115,8 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) /* this function returns a size_t, so we typecast to int to prevent warnings with picky compilers */ - nread = (int)conn->fread_func(data->req.upload_fromhere, 1, - buffersize, conn->fread_in); + nread = (int)data->set.fread_func(data->req.upload_fromhere, 1, + buffersize, data->set.in); if(nread == CURL_READFUNC_ABORT) { failf(data, "operation aborted by callback"); @@ -1013,9 +1013,9 @@ static CURLcode readwrite_upload(struct SessionHandle *data, * be read and written to/from the connection. */ CURLcode Curl_readwrite(struct connectdata *conn, + struct SessionHandle *data, bool *done) { - struct SessionHandle *data = conn->data; struct SingleRequest *k = &data->req; CURLcode result; int didwhat=0; |