diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/DISABLED | 3 | ||||
| -rw-r--r-- | tests/data/Makefile.inc | 3 | ||||
| -rw-r--r-- | tests/data/test1053 | 2 | ||||
| -rw-r--r-- | tests/data/test1133 | 4 | ||||
| -rw-r--r-- | tests/data/test1315 | 4 | ||||
| -rw-r--r-- | tests/data/test1404 | 63 | ||||
| -rw-r--r-- | tests/data/test158 | 1 | ||||
| -rw-r--r-- | tests/data/test163 | 1 | ||||
| -rw-r--r-- | tests/data/test166 | 1 | ||||
| -rw-r--r-- | tests/data/test173 | 1 | ||||
| -rw-r--r-- | tests/data/test186 | 5 | ||||
| -rw-r--r-- | tests/data/test259 | 6 | ||||
| -rw-r--r-- | tests/data/test277 | 5 | ||||
| -rw-r--r-- | tests/data/test554 | 2 | ||||
| -rw-r--r-- | tests/data/test587 | 1 | ||||
| -rw-r--r-- | tests/data/test589 | 55 | ||||
| -rw-r--r-- | tests/data/test643 | 131 | ||||
| -rw-r--r-- | tests/data/test644 | 58 | ||||
| -rw-r--r-- | tests/data/test645 | 141 | ||||
| -rw-r--r-- | tests/data/test646 | 98 | ||||
| -rw-r--r-- | tests/data/test647 | 79 | ||||
| -rw-r--r-- | tests/data/test71 | 1 | ||||
| -rw-r--r-- | tests/data/test9 | 1 | ||||
| -rw-r--r-- | tests/libtest/Makefile.inc | 15 | ||||
| -rw-r--r-- | tests/libtest/lib589.c | 59 | ||||
| -rw-r--r-- | tests/libtest/lib643.c | 270 | ||||
| -rw-r--r-- | tests/unit/unit1308.c | 6 |
27 files changed, 964 insertions, 52 deletions
diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 11d54b463..27ea77473 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -18,3 +18,6 @@ 1510 # Pipelining test that is causing false positives a little too often 1903 +# Entry point order should currently not be checked: mime API requires a +# SONAME change. +1135 diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 098f3f60f..8db5b80d0 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -71,13 +71,14 @@ test545 test546 test547 test548 test549 test550 test551 test552 test553 \ test554 test555 test556 test557 test558 test559 test560 test561 test562 \ test563 test564 test565 test566 test567 test568 test569 test570 test571 \ test572 test573 test574 test575 test576 test578 test579 test580 \ -test581 test582 test583 test584 test585 test586 test587 test588 \ +test581 test582 test583 test584 test585 test586 test587 test588 test589 \ test590 test591 test592 test593 test594 test595 test596 test597 test598 \ test599 test600 test601 test602 test603 test604 test605 test606 test607 \ test608 test609 test610 test611 test612 test613 test614 test615 test616 \ test617 test618 test619 test620 test621 test622 test623 test624 test625 \ test626 test627 test628 test629 test630 test631 test632 test633 test634 \ test635 test636 test637 test638 test639 test640 test641 test642 \ +test643 test644 test645 test646 test647 \ \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ test709 test710 test711 test712 test713 test714 test715 \ diff --git a/tests/data/test1053 b/tests/data/test1053 index 8c60e5ce3..239a1100f 100644 --- a/tests/data/test1053 +++ b/tests/data/test1053 @@ -79,7 +79,6 @@ User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 z Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 410
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
------------------------------9ef8d6205763
@@ -104,7 +103,6 @@ User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 z Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 410
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
------------------------------9ef8d6205763
diff --git a/tests/data/test1133 b/tests/data/test1133 index 8b016fc14..2238b9c07 100644 --- a/tests/data/test1133 +++ b/tests/data/test1133 @@ -47,8 +47,7 @@ POST /we/want/1133 HTTP/1.1 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
Host: %HOSTIP:%HTTPPORT
Accept: */*
-Content-Length: 967
-Expect: 100-continue
+Content-Length: 969
Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32
------------------------------24e78000bd32
@@ -89,6 +88,7 @@ This is a bar foo bar foo +
------------------------------24e78000bd32--
</protocol> </verify> diff --git a/tests/data/test1315 b/tests/data/test1315 index c2f158a95..888ddc5c1 100644 --- a/tests/data/test1315 +++ b/tests/data/test1315 @@ -47,8 +47,7 @@ POST /we/want/1315 HTTP/1.1 User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
Host: %HOSTIP:%HTTPPORT
Accept: */*
-Content-Length: 795
-Expect: 100-continue
+Content-Length: 797
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
------------------------------9ef8d6205763
@@ -77,6 +76,7 @@ Content-Type: text/plain dummy data ------------------------------aaaaaaaaaaaa--
+
------------------------------9ef8d6205763--
</protocol> </verify> diff --git a/tests/data/test1404 b/tests/data/test1404 index c86d2602c..60ed58a16 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -33,7 +33,7 @@ http SSL_CERT_FILE= </setenv> <command> -http://%HOSTIP:%HTTPPORT/we/want/1404 -F name=value -F 'file=@log/test1404.txt,log/test1404.txt;type=magic/content,log/test1404.txt' --libcurl log/test1404.c +http://%HOSTIP:%HTTPPORT/we/want/1404 -F name=value -F 'file=@log/test1404.txt,log/test1404.txt;type=magic/content,log/test1404.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl log/test1404.c </command> # We create this file before the command is invoked! <file name="log/test1404.txt"> @@ -51,8 +51,7 @@ POST /we/want/1404 HTTP/1.1 User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
Host: %HOSTIP:%HTTPPORT
Accept: */*
-Content-Length: 795
-Expect: 100-continue
+Content-Length: 849
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
------------------------------9ef8d6205763
@@ -77,10 +76,13 @@ dummy data ------------------------------9ef8d6205763
Content-Disposition: attachment; filename="test1404.txt"
Content-Type: text/plain
+X-testheader-1: header 1
+X-testheader-2: header 2
dummy data ------------------------------aaaaaaaaaaaa--
+
------------------------------9ef8d6205763--
</protocol> <stripfile> @@ -103,30 +105,41 @@ int main(int argc, char *argv[]) { CURLcode ret; CURL *hnd; - struct curl_httppost *post1; - struct curl_httppost *postend; + curl_mime *mime1; + curl_mimepart *part1; + curl_mime *mime2; + curl_mimepart *part2; + struct curl_slist *slist1; - post1 = NULL; - postend = NULL; - curl_formadd(&post1, &postend, - CURLFORM_COPYNAME, "name", - CURLFORM_COPYCONTENTS, "value", - CURLFORM_END); - curl_formadd(&post1, &postend, - CURLFORM_COPYNAME, "file", - CURLFORM_FILE, "log/test1404.txt", - CURLFORM_CONTENTTYPE, "text/plain", - CURLFORM_FILE, "log/test1404.txt", - CURLFORM_CONTENTTYPE, "magic/content", - CURLFORM_FILE, "log/test1404.txt", - CURLFORM_CONTENTTYPE, "text/plain", - CURLFORM_END); + mime1 = NULL; + mime2 = NULL; + slist1 = NULL; + slist1 = curl_slist_append(slist1, "X-testheader-1: header 1"); + slist1 = curl_slist_append(slist1, "X-testheader-2: header 2"); hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L); curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1404"); curl_easy_setopt(hnd, CURLOPT_HEADER, 1L); - curl_easy_setopt(hnd, CURLOPT_HTTPPOST, post1); + mime1 = curl_mime_init(hnd); + part1 = curl_mime_addpart(mime1); + curl_mime_data(part1, "value", -1); + curl_mime_name(part1, "name", -1); + part1 = curl_mime_addpart(mime1); + mime2 = curl_mime_init(hnd); + part2 = curl_mime_addpart(mime2); + curl_mime_filedata(part2, "log/test1404.txt"); + part2 = curl_mime_addpart(mime2); + curl_mime_filedata(part2, "log/test1404.txt"); + curl_mime_type(part2, "magic/content"); + part2 = curl_mime_addpart(mime2); + curl_mime_filedata(part2, "log/test1404.txt"); + curl_mime_headers(part2, slist1, 1); + slist1 = NULL; + curl_mime_subparts(part1, mime2); + mime2 = NULL; + curl_mime_name(part1, "file", -1); + curl_easy_setopt(hnd, CURLOPT_MIMEPOST, mime1); curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); @@ -156,8 +169,12 @@ int main(int argc, char *argv[]) curl_easy_cleanup(hnd); hnd = NULL; - curl_formfree(post1); - post1 = NULL; + curl_mime_free(mime1); + mime1 = NULL; + curl_mime_free(mime2); + mime2 = NULL; + curl_slist_free_all(slist1); + slist1 = NULL; return (int)ret; } diff --git a/tests/data/test158 b/tests/data/test158 index 9c4b22f70..dca51b163 100644 --- a/tests/data/test158 +++ b/tests/data/test158 @@ -41,7 +41,6 @@ User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 145
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc
------------------------------4f12fcdaa3bc
diff --git a/tests/data/test163 b/tests/data/test163 index 22341c045..b4e2d260f 100644 --- a/tests/data/test163 +++ b/tests/data/test163 @@ -54,7 +54,6 @@ User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 304
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------c2d1767eb6ac
------------------------------c2d1767eb6ac
diff --git a/tests/data/test166 b/tests/data/test166 index 2036773f8..f170752e6 100644 --- a/tests/data/test166 +++ b/tests/data/test166 @@ -46,7 +46,6 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 223
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991
------------------------------b0b3d6d23991
diff --git a/tests/data/test173 b/tests/data/test173 index bf6af0007..865ef7ba2 100644 --- a/tests/data/test173 +++ b/tests/data/test173 @@ -54,7 +54,6 @@ User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 360
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------5dbea401cd8c
------------------------------5dbea401cd8c
diff --git a/tests/data/test186 b/tests/data/test186 index b07736cbc..4abc74a2b 100644 --- a/tests/data/test186 +++ b/tests/data/test186 @@ -43,8 +43,7 @@ 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-Length: 320
Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5
------------------------------212d9006ceb5
@@ -56,7 +55,7 @@ daniel Content-Disposition: form-data; name="html"
Content-Type: text/html;charset=verymoo
- <body>hello</body>
+<body>hello</body>
------------------------------212d9006ceb5--
</protocol> </verify> diff --git a/tests/data/test259 b/tests/data/test259 index 9532887a9..6e1853601 100644 --- a/tests/data/test259 +++ b/tests/data/test259 @@ -59,7 +59,7 @@ crypto HTTP POST multipart with Expect: header using proxy anyauth (Digest) </name> <command> --x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/259 -F name=daniel -F tool=curl -F file=@log/test259.txt -U uuuser:pppassword --proxy-anyauth +-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/259 -F name=daniel -F tool=curl -F file=@log/test259.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue" </command> # We create this file before the command is invoked! <file name="log/test259.txt"> @@ -80,8 +80,8 @@ Host: remotehost:54321 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
Accept: */*
Proxy-Connection: Keep-Alive
-Content-Length: 409
Expect: 100-continue
+Content-Length: 409
Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
------------------------------7c633d5c27ce
@@ -107,8 +107,8 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 z Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"
Accept: */*
Proxy-Connection: Keep-Alive
-Content-Length: 409
Expect: 100-continue
+Content-Length: 409
Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
------------------------------7c633d5c27ce
diff --git a/tests/data/test277 b/tests/data/test277 index a509b40ec..d3e9d0fa4 100644 --- a/tests/data/test277 +++ b/tests/data/test277 @@ -45,12 +45,11 @@ POST /want/277 HTTP/1.1 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
Host: %HOSTIP:%HTTPPORT
Accept: */*
-Content-Length: 145
-Expect: 100-continue
+Content-Length: 146
Content-Type: text/info; boundary=------------------------
--------------------------
-Content-Disposition: form-data; name="name"
+Content-Disposition: attachment; name="name"
daniel
----------------------------
diff --git a/tests/data/test554 b/tests/data/test554 index 3419e5e0f..ce4a14dc4 100644 --- a/tests/data/test554 +++ b/tests/data/test554 @@ -69,7 +69,6 @@ POST /554 HTTP/1.1 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 718
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------
------------------------------
@@ -100,7 +99,6 @@ POST /554 HTTP/1.1 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 732
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------
------------------------------
diff --git a/tests/data/test587 b/tests/data/test587 index 69cbe1ed7..689a877db 100644 --- a/tests/data/test587 +++ b/tests/data/test587 @@ -43,7 +43,6 @@ POST /587 HTTP/1.1 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 718
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------
------------------------------
diff --git a/tests/data/test589 b/tests/data/test589 new file mode 100644 index 000000000..451bb15bd --- /dev/null +++ b/tests/data/test589 @@ -0,0 +1,55 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP POST +HTTP MIME +</keywords> +</info> + +# +# 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: 3
+
+OK +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib589 +</tool> + + <name> +make a HTTP MIME POST set to NULL + </name> + <command> +http://%HOSTIP:%HTTPPORT/589 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +POST /589 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test643 b/tests/data/test643 new file mode 100644 index 000000000..0eaf22c5f --- /dev/null +++ b/tests/data/test643 @@ -0,0 +1,131 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP POST +HTTP MIME POST +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
+hello +</data> +<datacheck> +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
+hello +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
+hello +</datacheck> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib643 +</tool> + + <name> +HTTP multi-part mimepost using read callback for the file part + </name> + <command> +http://%HOSTIP:%HTTPPORT/643 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^--------------------------[a-z0-9]*/------------------------------/ +s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ +</strippart> +# Note that the stripping above removes 12 bytes from every occurrence of the +# boundary string and since 5 of them are in the body contents, we see +# (5*12) == 60 bytes less +<protocol> +POST /643 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 718
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+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"
+
+postit2.c
+------------------------------
+Content-Disposition: form-data; name="submit"
+
+send
+------------------------------
+Content-Disposition: form-data; name="somename"; filename="somefile.txt"
+Content-Type: text/plain
+
+blah blah
+--------------------------------
+POST /643 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 732
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2"
+
+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"
+
+postit2.c
+------------------------------
+Content-Disposition: form-data; name="submit"
+
+send
+------------------------------
+Content-Disposition: form-data; name="somename"; filename="somefile.txt"
+Content-Type: text/plain
+
+blah blah
+--------------------------------
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test644 b/tests/data/test644 new file mode 100644 index 000000000..6ac37ce54 --- /dev/null +++ b/tests/data/test644 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP POST +HTTP MIME POST +</keywords> +</info> + +# +# Server-side +<reply> +<data> +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib644 +</tool> + + <name> +HTTP multi-part formpost with aborted read callback + </name> + <command> +http://%HOSTIP:%HTTPPORT/644 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^--------------------------[a-z0-9]*/------------------------------/ +s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ +</strippart> +<protocol> +POST /644 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 718
+Content-Type: multipart/form-data; boundary=----------------------------
+
+------------------------------
+Content-Disposition: form-data; name="sendfile"; filename="postit2.c"
+
+</protocol> +# CURLE_ABORTED_BY_CALLBACK (42) +<errorcode> +42 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test645 b/tests/data/test645 new file mode 100644 index 000000000..6533944b4 --- /dev/null +++ b/tests/data/test645 @@ -0,0 +1,141 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP POST +HTTP MIME POST +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
+hello +</data> +<datacheck> +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
+hello +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
+hello +</datacheck> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib645 +</tool> + + <name> +HTTP multi-part chunked mimepost using read callback for the file part + </name> + <command> +http://%HOSTIP:%HTTPPORT/645 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^--------------------------[a-z0-9]*/------------------------------/ +s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ +</strippart> +# Note that the stripping above removes 12 bytes from every occurrence of the +# boundary string and since 5 of them are in the body contents, we see +# (5*12) == 60 bytes less +<protocol> +POST /645 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: multipart/form-data; boundary=----------------------------
+Expect: 100-continue
+
+2ce
+------------------------------
+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"
+
+postit2.c
+------------------------------
+Content-Disposition: form-data; name="submit"
+
+send
+------------------------------
+Content-Disposition: form-data; name="somename"; filename="somefile.txt"
+Content-Type: text/plain
+
+blah blah
+--------------------------------
+
+0
+
+POST /645 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Transfer-Encoding: chunked
+Content-Type: multipart/form-data; boundary=----------------------------
+Expect: 100-continue
+
+2dc
+------------------------------
+Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2"
+
+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"
+
+postit2.c
+------------------------------
+Content-Disposition: form-data; name="submit"
+
+send
+------------------------------
+Content-Disposition: form-data; name="somename"; filename="somefile.txt"
+Content-Type: text/plain
+
+blah blah
+--------------------------------
+
+0
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test646 b/tests/data/test646 new file mode 100644 index 000000000..a53c34090 --- /dev/null +++ b/tests/data/test646 @@ -0,0 +1,98 @@ +<testcase> +<info> +<keywords> +SMTP +MULTIPART +</keywords> +</info> + +# +# Server-side +<reply> +</reply> + +# +# Client-side +<client> +<server> +smtp +</server> + <name> +SMTP multipart using mime API + </name> +<stdin> +From: different
+To: another
+
+body
+</stdin> + <command> +smtp://%HOSTIP:%SMTPPORT/646 --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@log/headers646" -F "=)" -F "=@log/test646.txt;headers=<log/headers646" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>" +</command> +<file1 name="log/test646.txt"> +This is an attached file. + +It may contain any type of data. +</file1> +<file2 name="log/headers646"> +# This line is a comment +X-fileheader1: This is a header from a file
+ +# This line is another comment. It precedes a folded header. +X-fileheader2: This is
#a + folded header +</file2> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^--------------------------[a-z0-9]*/------------------------------/ +s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ +</strippart> +<protocol> +EHLO 646
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
+</protocol> +<upload> +Content-Type: multipart/mixed; boundary=----------------------------
+Mime-Version: 1.0
+From: different
+To: another
+Reply-To: <followup@example.com>
+
+------------------------------
+Content-Type: multipart/alternative; boundary=----------------------------
+
+------------------------------
+Content-Type: text/html
+Content-Transfer-Encoding: 8bit
+X-test1: this is a header
+X-test2: this is another header
+
+<body>This is the html version</body>
+------------------------------
+X-fileheader1: This is a header from a file
+X-fileheader2: This is #a folded header
+
+This is the plain text version
+--------------------------------
+
+------------------------------
+Content-Disposition: attachment; filename="test646.txt"
+X-fileheader1: This is a header from a file
+X-fileheader2: This is #a folded header
+
+This is an attached file. + +It may contain any type of data. +
+--------------------------------
+.
+</upload> +</verify> +</testcase> diff --git a/tests/data/test647 b/tests/data/test647 new file mode 100644 index 000000000..de2b467fc --- /dev/null +++ b/tests/data/test647 @@ -0,0 +1,79 @@ +<testcase> +<info> +<keywords> +IMAP +APPEND +MULTIPART +</keywords> +</info> + +# +# Server-side +<reply> +</reply> + +# +# Client-side +<client> +<server> +imap +</server> + <name> +IMAP APPEND multipart using mime API + </name> + <command> +imap://%HOSTIP:%IMAPPORT/647 -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@log/test647.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret +</command> +<file name="log/test647.txt"> +This is an attached file. + +It may contain any type of data. +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^--------------------------[a-z0-9]*/------------------------------/ +s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ +</strippart> +<protocol> +A001 CAPABILITY
+A002 LOGIN user secret
+A003 APPEND 647 (\Seen) {892}
+A004 LOGOUT
+</protocol> +<upload> +Content-Type: multipart/mixed; boundary=----------------------------
+Mime-Version: 1.0
+Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
+From: Fred Foobar <foobar@example.com>
+To: joe@example.com
+Message-Id: <B27397-0100000@example.com>
+Subject: afternoon meeting
+
+------------------------------
+Content-Type: multipart/alternative; boundary=----------------------------
+
+------------------------------
+Content-Type: text/html
+Content-Transfer-Encoding: 8bit
+
+<body>This is the html version</body>
+------------------------------
+
+This is the plain text version
+--------------------------------
+
+------------------------------
+Content-Disposition: attachment; filename="test647.txt"
+
+This is an attached file. + +It may contain any type of data. +
+--------------------------------
+</upload> +</verify> +</testcase> diff --git a/tests/data/test71 b/tests/data/test71 index 341a0033f..0bc76fc03 100644 --- a/tests/data/test71 +++ b/tests/data/test71 @@ -54,7 +54,6 @@ POST /we/want/71 HTTP/1.1 Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 408
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
------------------------------9ef8d6205763
diff --git a/tests/data/test9 b/tests/data/test9 index 7905ac838..53fe25eda 100644 --- a/tests/data/test9 +++ b/tests/data/test9 @@ -48,7 +48,6 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 z Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 407
-Expect: 100-continue
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
------------------------------9ef8d6205763
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 727582bd0..b372dfbd6 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -19,7 +19,8 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 lib557 lib558 \ lib559 lib560 lib562 lib564 lib565 lib566 lib567 lib568 lib569 lib570 \ lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \ - lib583 lib585 lib586 lib587 lib590 lib591 lib597 lib598 lib599 \ + lib583 lib585 lib586 lib587 lib589 lib590 lib591 lib597 lib598 lib599 \ + lib643 lib644 lib645 \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \ lib1520 lib1521 \ @@ -282,6 +283,9 @@ lib586_CPPFLAGS = $(AM_CPPFLAGS) lib587_SOURCES = lib554.c $(SUPPORTFILES) lib587_CPPFLAGS = $(AM_CPPFLAGS) -DLIB587 +lib589_SOURCES = lib589.c $(SUPPORTFILES) +lib589_CPPFLAGS = $(AM_CPPFLAGS) + lib590_SOURCES = lib590.c $(SUPPORTFILES) lib590_CPPFLAGS = $(AM_CPPFLAGS) @@ -299,6 +303,15 @@ lib598_CPPFLAGS = $(AM_CPPFLAGS) lib599_SOURCES = lib599.c $(SUPPORTFILES) lib599_CPPFLAGS = $(AM_CPPFLAGS) +lib643_SOURCES = lib643.c $(SUPPORTFILES) +lib643_CPPFLAGS = $(AM_CPPFLAGS) + +lib644_SOURCES = lib643.c $(SUPPORTFILES) +lib644_CPPFLAGS = $(AM_CPPFLAGS) -DLIB644 + +lib645_SOURCES = lib643.c $(SUPPORTFILES) +lib645_CPPFLAGS = $(AM_CPPFLAGS) -DLIB645 + lib1500_SOURCES = lib1500.c $(SUPPORTFILES) $(TESTUTIL) lib1500_LDADD = $(TESTUTIL_LIBS) lib1500_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib589.c b/tests/libtest/lib589.c new file mode 100644 index 000000000..1e5ebb1e4 --- /dev/null +++ b/tests/libtest/lib589.c @@ -0,0 +1,59 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +int test(char *URL) +{ + CURL *curl; + CURLcode res=CURLE_OK; + + if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + curl = curl_easy_init(); + if(!curl) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + /* First set the URL that is about to receive our POST. */ + test_setopt(curl, CURLOPT_URL, URL); + test_setopt(curl, CURLOPT_MIMEPOST, NULL); + test_setopt(curl, CURLOPT_VERBOSE, 1L); /* show verbose for debug */ + test_setopt(curl, CURLOPT_HEADER, 1L); /* include header */ + + /* Now, we should be making a zero byte POST request */ + res = curl_easy_perform(curl); + +test_cleanup: + + /* always cleanup */ + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return (int)res; +} diff --git a/tests/libtest/lib643.c b/tests/libtest/lib643.c new file mode 100644 index 000000000..ea5a96740 --- /dev/null +++ b/tests/libtest/lib643.c @@ -0,0 +1,270 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +static char data[]= +#ifdef CURL_DOES_CONVERSIONS + /* ASCII representation with escape sequences for non-ASCII platforms */ + "\x74\x68\x69\x73\x20\x69\x73\x20\x77\x68\x61\x74\x20\x77\x65\x20\x70" + "\x6f\x73\x74\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x69\x6c\x6c\x79\x20" + "\x77\x65\x62\x20\x73\x65\x72\x76\x65\x72\x0a"; +#else + "this is what we post to the silly web server\n"; +#endif + +struct WriteThis { + char *readptr; + size_t sizeleft; +}; + +static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp) +{ +#ifdef LIB644 + (void)ptr; + (void)size; + (void)nmemb; + (void)userp; + return CURL_READFUNC_ABORT; +#else + + struct WriteThis *pooh = (struct WriteThis *)userp; + int eof = !*pooh->readptr; + + if(size*nmemb < 1) + return 0; + +#ifndef LIB645 + eof = !pooh->sizeleft; + if(!eof) + pooh->sizeleft--; +#endif + + if(!eof) { + *ptr = *pooh->readptr; /* copy one single byte */ + pooh->readptr++; /* advance pointer */ + return 1; /* we return 1 byte at a time! */ + } + + return 0; /* no more data left to deliver */ +#endif +} + +static int once(char *URL, bool oldstyle) +{ + CURL *curl; + CURLcode res = CURLE_OK; + + curl_mime *mime = NULL; + curl_mimepart *part = NULL; + struct WriteThis pooh; + struct WriteThis pooh2; + curl_off_t datasize = -1; + + pooh.readptr = data; +#ifndef LIB645 + datasize = strlen(data); +#endif + pooh.sizeleft = datasize; + + curl = curl_easy_init(); + if(!curl) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + mime = curl_mime_init(curl); + if(!mime) { + fprintf(stderr, "curl_mime_init() failed\n"); + curl_easy_cleanup(curl); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + part = curl_mime_addpart(mime); + if(!part) { + fprintf(stderr, "curl_mime_addpart(1) failed\n"); + curl_mime_free(mime); + curl_easy_cleanup(curl); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + /* Fill in the file upload part */ + if(oldstyle) { + res = curl_mime_name(part, "sendfile", -1); + if(!res) + res = curl_mime_data_cb(part, datasize, read_callback, + NULL, NULL, &pooh); + if(!res) + res = curl_mime_filename(part, "postit2.c"); + } + else { + /* new style */ + res = curl_mime_name(part, "sendfile alternative", -1); + if(!res) + res = curl_mime_data_cb(part, datasize, read_callback, + NULL, NULL, &pooh); + if(!res) + res = curl_mime_filename(part, "file name 2"); + } + + if(res) + printf("curl_mime_xxx(1) = %s\n", curl_easy_strerror(res)); + + /* 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; +#ifndef LIB645 + datasize = strlen(data); +#endif + pooh2.sizeleft = datasize; + + part = curl_mime_addpart(mime); + if(!part) { + fprintf(stderr, "curl_mime_addpart(2) failed\n"); + curl_mime_free(mime); + curl_easy_cleanup(curl); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + /* Fill in the file upload part */ + res = curl_mime_name(part, "callbackdata", -1); + if(!res) + res = curl_mime_data_cb(part, datasize, read_callback, + NULL, NULL, &pooh2); + + if(res) + printf("curl_mime_xxx(2) = %s\n", curl_easy_strerror(res)); + + part = curl_mime_addpart(mime); + if(!part) { + fprintf(stderr, "curl_mime_addpart(3) failed\n"); + curl_mime_free(mime); + curl_easy_cleanup(curl); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + /* Fill in the filename field */ + res = curl_mime_name(part, "filename", -1); + if(!res) + res = curl_mime_data(part, +#ifdef CURL_DOES_CONVERSIONS + /* ASCII representation with escape + sequences for non-ASCII platforms */ + "\x70\x6f\x73\x74\x69\x74\x32\x2e\x63", +#else + "postit2.c", +#endif + -1); + + if(res) + printf("curl_mime_xxx(3) = %s\n", curl_easy_strerror(res)); + + /* Fill in a submit field too */ + part = curl_mime_addpart(mime); + if(!part) { + fprintf(stderr, "curl_mime_addpart(4) failed\n"); + curl_mime_free(mime); + curl_easy_cleanup(curl); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + res = curl_mime_name(part, "submit", -1); + if(!res) + res = curl_mime_data(part, +#ifdef CURL_DOES_CONVERSIONS + /* ASCII representation with escape + sequences for non-ASCII platforms */ + "\x73\x65\x6e\x64", +#else + "send", +#endif + -1); + + if(res) + printf("curl_mime_xxx(4) = %s\n", curl_easy_strerror(res)); + + part = curl_mime_addpart(mime); + if(!part) { + fprintf(stderr, "curl_mime_addpart(5) failed\n"); + curl_mime_free(mime); + curl_easy_cleanup(curl); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + res = curl_mime_name(part, "somename", -1); + if(!res) + res = curl_mime_filename(part, "somefile.txt"); + if(!res) + res = curl_mime_data(part, "blah blah", 9); + + if(res) + printf("curl_mime_xxx(5) = %s\n", curl_easy_strerror(res)); + + /* First set the URL that is about to receive our POST. */ + test_setopt(curl, CURLOPT_URL, URL); + + /* send a multi-part mimepost */ + test_setopt(curl, CURLOPT_MIMEPOST, mime); + + /* get verbose debug output please */ + test_setopt(curl, CURLOPT_VERBOSE, 1L); + + /* include headers in the output */ + test_setopt(curl, CURLOPT_HEADER, 1L); + + /* Perform the request, res will get the return code */ + res = curl_easy_perform(curl); + +test_cleanup: + + /* always cleanup */ + curl_easy_cleanup(curl); + + /* now cleanup the mimepost structure */ + curl_mime_free(mime); + + return res; +} + +int test(char *URL) +{ + int res; + + if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + res = once(URL, TRUE); /* old */ + if(!res) + res = once(URL, FALSE); /* new */ + + curl_global_cleanup(); + + return res; +} diff --git a/tests/unit/unit1308.c b/tests/unit/unit1308.c index 5c1a00867..ac41c9d4a 100644 --- a/tests/unit/unit1308.c +++ b/tests/unit/unit1308.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -71,7 +71,7 @@ UNITTEST_START fail_unless(rc == 0, "curl_formget returned error"); - fail_unless(total_size == 486, "curl_formget got wrong size back"); + fail_unless(total_size == 488, "curl_formget got wrong size back"); curl_formfree(post); @@ -88,7 +88,7 @@ UNITTEST_START rc = curl_formget(post, &total_size, print_httppost_callback); fail_unless(rc == 0, "curl_formget returned error"); - fail_unless(total_size == 847, "curl_formget got wrong size back"); + fail_unless(total_size == 851, "curl_formget got wrong size back"); curl_formfree(post); |