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

curl_formget: treat CURLFORM_STREAM better

Browse Source 
If a piece is set to use a callback to get the data, it should not be
treated as data. It unfortunately also requires that curl_easy_perform()
or similar has been used as otherwise the callback function hasn't been
figured out and curl_formget won't know how to get the content.
This commit is contained in:
Daniel Stenberg 2011-06-13 22:05:13 +02:00
parent 84e13f2e07
commit 85881f9f35
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/formdata.c
View File

@ -875,7 +875,7 @@ int curl_formget(struct curl_httppost *form, void *arg,
return (int)rc;
for(ptr = data; ptr; ptr = ptr->next) {
if(ptr->type == FORM_FILE) {
if((ptr->type == FORM_FILE) || (ptr->type == FORM_CALLBACK)) {
char buffer[8192];
size_t nread;
struct Form temp;
@ -1301,8 +1301,12 @@ static size_t readfromfile(struct Form *form, char *buffer,
size_t nread;
bool callback = (bool)(form->data->type == FORM_CALLBACK);
if(callback)
nread = form->fread_func(buffer, 1, size, form->data->line);
if(callback) {
if(form->fread_func == ZERO_NULL)
return 0;
else
nread = form->fread_func(buffer, 1, size, form->data->line);
}
else {
if(!form->fp) {
/* this file hasn't yet been opened */