mime: keep "text/plain" content type if user-specified.

Include test cases in 554, 587, 650.

Fixes https://github.com/curl/curl/issues/1986
This commit is contained in:
Patrick Monnerat 2017-10-12 19:36:16 +01:00
parent 56509055d2
commit 0401734dfd
7 changed files with 35 additions and 27 deletions

View file

@ -68,7 +68,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
POST /554 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 718
Content-Length: 744
Content-Type: multipart/form-data; boundary=----------------------------
------------------------------
@ -87,6 +87,7 @@ Content-Disposition: form-data; name="filename"
postit2.c
------------------------------
Content-Disposition: form-data; name="submit"
Content-Type: text/plain
send
------------------------------
@ -98,7 +99,7 @@ blah blah
POST /554 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 732
Content-Length: 758
Content-Type: multipart/form-data; boundary=----------------------------
------------------------------
@ -117,6 +118,7 @@ Content-Disposition: form-data; name="filename"
postit2.c
------------------------------
Content-Disposition: form-data; name="submit"
Content-Type: text/plain
send
------------------------------

View file

@ -43,7 +43,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
POST /587 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 718
Content-Length: 744
Content-Type: multipart/form-data; boundary=----------------------------
------------------------------

View file

@ -63,9 +63,12 @@ Transfer-Encoding: chunked
Content-Type: multipart/form-data; boundary=----------------------------
Expect: 100-continue
5f0
60a
------------------------------
Content-Disposition: form-data; name="fieldname"
Content-Type: text/plain
X-customheader-1: Header 1 data
X-customheader-2: Header 2 data
this is what we post to the silly web server
------------------------------
@ -98,15 +101,13 @@ This is data from a file.
------------------------------
Content-Disposition: form-data; name="filecontents"
X-customheader-1: Header 1 data
X-customheader-2: Header 2 data
This is data from a file.
------------------------------
Content-Disposition: form-data; name="formlength"
1341
1367
------------------------------
Content-Disposition: form-data; name="standardinput"
Content-Type: application/octet-stream