From f851f768578dc096c561d57ba07ffd1004d504c0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 17 Jun 2011 22:21:36 +0200 Subject: CURLFORM_STREAM: acknowledge CURLFORM_FILENAME The CURLFORM_STREAM is documented to only insert a file name (and thus look like a file upload) in the part if CURLFORM_FILENAME is set, but in reality it always inserted a filename="" and if CURLFORM_FILENAME wasn't set, it would insert insert rubbish (or possibly crash). This is now fixed to work as documented, and test 554 has been extended to verify this. Reported by: Sascha Swiercy Bug: http://curl.haxx.se/mail/lib-2011-06/0070.html --- tests/libtest/lib554.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests/libtest') diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index d510268e7..ed8d13f05 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -64,6 +64,7 @@ int test(char *URL) struct curl_httppost *formpost=NULL; struct curl_httppost *lastptr=NULL; struct WriteThis pooh; + struct WriteThis pooh2; if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { fprintf(stderr, "curl_global_init() failed\n"); @@ -85,6 +86,23 @@ int test(char *URL) if(formrc) printf("curl_formadd(1) = %d\n", (int)formrc); + /* Now add the same data with another name and make it not look like + a file upload but still using the callback */ + + pooh2.readptr = data; + pooh2.sizeleft = strlen(data); + + /* Fill in the file upload field */ + formrc = curl_formadd(&formpost, + &lastptr, + CURLFORM_COPYNAME, "callbackdata", + CURLFORM_STREAM, &pooh2, + CURLFORM_CONTENTSLENGTH, pooh2.sizeleft, + CURLFORM_END); + + if(formrc) + printf("curl_formadd(1) = %d\n", (int)formrc); + /* Fill in the filename field */ formrc = curl_formadd(&formpost, &lastptr, -- cgit v1.2.3