eeb2cb05a1
The -F option allows some custom parameters within the given string, and those strings are separated with semicolons. You can for example specify "name=daniel;type=text/plain" to set content-type for the field. However, the use of semicolons like that made it not work fine if you specified one within the content-type, like for: "name=daniel;type=text/plain;charset=UTF-8" ... as the second one would be seen as a separator and "charset" is no parameter curl knows anything about so it was just silently discarded. The new logic now checks if the semicolon and following keyword looks like a parameter it knows about and if it isn't it is assumed to be meant to be used within the content-type string itself. I modified test case 186 to verify that this works as intended. Reported by: Larry Stone Bug: http://curl.haxx.se/bug/view.cgi?id=3048988
57 lines
1.3 KiB
Plaintext
57 lines
1.3 KiB
Plaintext
<testcase>
|
|
# Server-side
|
|
<reply>
|
|
<data>
|
|
HTTP/1.1 200 OK swsclose
|
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 11
|
|
|
|
blablabla
|
|
|
|
</data>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
HTTP RFC1867-type formposting with types on text fields
|
|
</name>
|
|
<command>
|
|
http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <body>hello</body>;type=text/html;charset=verymoo"
|
|
</command>
|
|
# We create this file before the command is invoked!
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strip>
|
|
^(User-Agent:|Content-Type: multipart/form-data;|------------).*
|
|
</strip>
|
|
<protocol>
|
|
POST /we/want/186 HTTP/1.1
|
|
User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.1 c-ares/1.2.0 libidn/0.5.2
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Accept: */*
|
|
Content-Length: 321
|
|
Expect: 100-continue
|
|
Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5
|
|
|
|
------------------------------212d9006ceb5
|
|
Content-Disposition: form-data; name="name"
|
|
Content-Type: moo/foo
|
|
|
|
daniel
|
|
------------------------------212d9006ceb5
|
|
Content-Disposition: form-data; name="html"
|
|
Content-Type: text/html;charset=verymoo
|
|
|
|
<body>hello</body>
|
|
------------------------------212d9006ceb5--
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|