generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

read_callback: move to SessionHandle from connectdata

Browse Source 
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.
This commit is contained in:
Daniel Stenberg
2015-05-20 14:33:04 +02:00
parent 6a688976f0
commit b0143a2a33
10 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/transfer.c
View File

@@ -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;