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/data/test554 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tests/data/test554') diff --git a/tests/data/test554 b/tests/data/test554 index 134f7ef97..7fdc353fc 100644 --- a/tests/data/test554 +++ b/tests/data/test554 @@ -39,13 +39,13 @@ s/^------------------------------[a-z0-9]*/------------------------------/ s/boundary=----------------------------[a-z0-9]*/boundary=----------------------------/ # Note that the stripping above removes 12 bytes from every occurance of the -# boundary string and since 4 of them are in the body contents, we see -# 415 - (4*12) here == 367 bytes. +# boundary string and since 5 of them are in the body contents, we see +# (5*12) == 60 bytes less POST /554 HTTP/1.1 Host: %HOSTIP:%HTTPPORT Accept: */* -Content-Length: 415 +Content-Length: 561 Expect: 100-continue Content-Type: multipart/form-data; boundary=---------------------------- @@ -54,6 +54,11 @@ Content-Disposition: form-data; name="sendfile"; filename="postit2.c" this is what we post to the silly web server +------------------------------ +Content-Disposition: form-data; name="callbackdata" + +this is what we post to the silly web server + ------------------------------ Content-Disposition: form-data; name="filename" -- cgit v1.2.3