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

removed the last \r\n\r\n bytes

Browse Source 
now returns -1 from FormReader() when the last form data has been read!
This commit is contained in:
Daniel Stenberg 2000-06-15 14:33:17 +00:00
parent f93baee594
commit e9957b87cd
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/formdata.c
View File

@ -318,6 +318,7 @@ static int AddFormData(struct FormData **formp,
newform->line = (char *)malloc(length+1); newform->line = (char *)malloc(length+1);
memcpy(newform->line, line, length+1); memcpy(newform->line, line, length+1);
newform->length = length; newform->length = length;
newform->line[length]=0; /* zero terminate for easier debugging */
if(*formp) { if(*formp) {
(*formp)->next = newform; (*formp)->next = newform;
@ -517,12 +518,20 @@ int FormInit(struct Form *form, struct FormData *formdata )
{ {
if(!formdata) if(!formdata)
return 1; /* error */ return 1; /* error */
/* First, make sure that we'll send a nice terminating sequence at the end #if 0
struct FormData *lastnode=formdata;
/* find the last node in the list */
while(lastnode->next) {
lastnode = lastnode->next;
}
/* Now, make sure that we'll send a nice terminating sequence at the end
* of the post. We *DONT* add this string to the size of the data since this * of the post. We *DONT* add this string to the size of the data since this
* is actually AFTER the data. */ * is actually AFTER the data. */
AddFormDataf(&formdata, "\r\n\r\n"); AddFormDataf(&lastnode, "\r\n\r\n");
#endif
form->data = formdata; form->data = formdata;
form->sent = 0; form->sent = 0;
@ -544,7 +553,7 @@ int FormReader(char *buffer,
wantedsize = size * nitems; wantedsize = size * nitems;
if(!form->data) if(!form->data)
return 0; /* nothing, error, empty */ return -1; /* nothing, error, empty */
do { do {