mirror of
https://github.com/moparisthebest/curl
synced 2024-11-05 09:05:04 -05:00
c1c27625c7
The feature is only enabled if the output is believed to be a tty. -J: There's some minor differences and improvements in -J handling, as now J should work with -i and it actually creates a file first using the initial name and then *renames* that to the one found in Content-Disposition (if any). -i: only shows headers for HTTP transfers now (as documented). Previously it would also show for pieces of the transfer that were HTTP (for example when doing FTP over a HTTP proxy). -i: now shows trailers as well. Previously they were not shown at all. --libcurl: the CURLOPT_HEADER is no longer set, as the header output is now done in the header callback.
186 lines
5.1 KiB
Plaintext
186 lines
5.1 KiB
Plaintext
<testcase>
|
|
# Based on test 1315
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP FORMPOST
|
|
HTTP file upload
|
|
--libcurl
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data>
|
|
HTTP/1.1 200 OK
|
|
Date: Thu, 29 Jul 2008 14:49:00 GMT
|
|
Server: test-server/fake
|
|
Content-Length: 0
|
|
Connection: close
|
|
|
|
</data>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<name>
|
|
--libcurl for HTTP RFC1867-type formposting - -F with 3 files, one with explicit type & encoder
|
|
</name>
|
|
<setenv>
|
|
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;encoder=8bit,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">
|
|
dummy data
|
|
</file>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<strip>
|
|
(^User-Agent:.*|-----+\w+)
|
|
</strip>
|
|
<protocol>
|
|
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: 882
|
|
Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
|
|
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="name"
|
|
|
|
value
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: form-data; name="file"
|
|
Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa
|
|
|
|
Content-Disposition: attachment; filename="test1404.txt"
|
|
Content-Type: text/plain
|
|
|
|
dummy data
|
|
|
|
------------------------------9ef8d6205763
|
|
Content-Disposition: attachment; filename="test1404.txt"
|
|
Content-Type: magic/content
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
# curl's default user-agent varies with version, libraries etc.
|
|
s/(USERAGENT, \")[^\"]+/${1}stripped/
|
|
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
|
|
# configurations - just ignore them
|
|
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
|
|
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
|
|
$_ = '' if /CURLOPT_HTTP_VERSION/
|
|
</stripfile>
|
|
<file name="log/test1404.c" mode="text">
|
|
/********* Sample code generated by the curl command line tool **********
|
|
* All curl_easy_setopt() options are documented at:
|
|
* https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
|
|
************************************************************************/
|
|
#include <curl/curl.h>
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
CURLcode ret;
|
|
CURL *hnd;
|
|
curl_mime *mime1;
|
|
curl_mimepart *part1;
|
|
curl_mime *mime2;
|
|
curl_mimepart *part2;
|
|
struct curl_slist *slist1;
|
|
|
|
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");
|
|
mime1 = curl_mime_init(hnd);
|
|
part1 = curl_mime_addpart(mime1);
|
|
curl_mime_data(part1, "value", CURL_ZERO_TERMINATED);
|
|
curl_mime_name(part1, "name");
|
|
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_encoder(part2, "8bit");
|
|
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");
|
|
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);
|
|
curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
|
|
|
|
/* Here is a list of options the curl code used that cannot get generated
|
|
as source easily. You may select to either not use them or implement
|
|
them yourself.
|
|
|
|
CURLOPT_WRITEDATA set to a objectpointer
|
|
CURLOPT_INTERLEAVEDATA set to a objectpointer
|
|
CURLOPT_WRITEFUNCTION set to a functionpointer
|
|
CURLOPT_READDATA set to a objectpointer
|
|
CURLOPT_READFUNCTION set to a functionpointer
|
|
CURLOPT_SEEKDATA set to a objectpointer
|
|
CURLOPT_SEEKFUNCTION set to a functionpointer
|
|
CURLOPT_ERRORBUFFER set to a objectpointer
|
|
CURLOPT_STDERR set to a objectpointer
|
|
CURLOPT_DEBUGFUNCTION set to a functionpointer
|
|
CURLOPT_DEBUGDATA set to a objectpointer
|
|
CURLOPT_HEADERFUNCTION set to a functionpointer
|
|
CURLOPT_HEADERDATA set to a objectpointer
|
|
|
|
*/
|
|
|
|
ret = curl_easy_perform(hnd);
|
|
|
|
curl_easy_cleanup(hnd);
|
|
hnd = NULL;
|
|
curl_mime_free(mime1);
|
|
mime1 = NULL;
|
|
curl_mime_free(mime2);
|
|
mime2 = NULL;
|
|
curl_slist_free_all(slist1);
|
|
slist1 = NULL;
|
|
|
|
return (int)ret;
|
|
}
|
|
/**** End of sample code ****/
|
|
</file>
|
|
</verify>
|
|
</testcase>
|