It was introduced in commit
eeb2cb05 along with the -F type=
change. Also fixed a typo in the name of the magic filename=
parameter. Tweaked tests 39 and 173 to better test this path.
specified and if not we simply assume that it is text that
the user wants included in the type and include that too up
to the next zero or semicolon. */
- if((*sep==';') && !curlx_strnequal(";filname=", sep, 9))
- sep = strchr(sep+1, ';');
+ if((*sep==';') && !curlx_strnequal(";filename=", sep, 10)) {
+ sep2 = strchr(sep+1, ';');
+ if (sep2)
+ sep = sep2;
+ else
+ sep = sep+strlen(sep); /* point to end of string */
+ }
if(*sep) {
*sep=0; /* zero terminate type string */
<testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
# Server-side
<reply>
<data>
HTTP RFC1867-formpost a file from stdin with "faked" filename
</name>
<command>
-http://%HOSTIP:%HTTPPORT/we/want/173 -F field1=contents1 -F "fileupload=@-;filename=/dev/null"
+http://%HOSTIP:%HTTPPORT/we/want/173 -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl"
</command>
<stdin>
User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
Host: %HOSTIP:%HTTPPORT\r
Accept: */*\r
-Content-Length: 359\r
+Content-Length: 360\r
Expect: 100-continue\r
Content-Type: multipart/form-data; boundary=----------------------------5dbea401cd8c\r
\r
contents1\r
------------------------------5dbea401cd8c\r
Content-Disposition: form-data; name="fileupload"; filename="/dev/null"\r
-Content-Type: application/octet-stream\r
+Content-Type: text/x-null;format=x-curl\r
\r
line1
line2
HTTP RFC1867-type formposting with filename= and type=
</name>
<command>
-http://%HOSTIP:%HTTPPORT/we/want/39 -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test39.txt;filename=fakerfile;type=moo/foobar" -F file2=@log/test39.txt
+http://%HOSTIP:%HTTPPORT/we/want/39 -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test39.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test39.txt
</command>
# We create this file before the command is invoked!
<file name="log/test39.txt">