diff options
| -rw-r--r-- | tests/data/test549 | 62 | ||||
| -rw-r--r-- | tests/data/test550 | 62 | ||||
| -rw-r--r-- | tests/libtest/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/libtest/lib549.c | 48 |
4 files changed, 176 insertions, 1 deletions
diff --git a/tests/data/test549 b/tests/data/test549 new file mode 100644 index 000000000..019573097 --- /dev/null +++ b/tests/data/test549 @@ -0,0 +1,62 @@ +<testcase> +<info> +<keywords> +FTP +CURLOPT_PROXY_TRANSFER_MODE +CURLOPT_PROXY +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="1"> +HTTP/1.1 200 OK swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 + +hello +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> +<tool> +lib549 +</tool> + <name> +FPT RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE + </name> +# first URL then proxy + <command> +ftp://www.haxx.se/moo/549 http://%HOSTIP:%HTTPPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET ftp://www.haxx.se/moo/549;type=i HTTP/1.1
+Host: www.haxx.se:21
+Pragma: no-cache
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +<stdout mode="text"> +hello +</stdout> +</verify> +</testcase> diff --git a/tests/data/test550 b/tests/data/test550 new file mode 100644 index 000000000..06f8918d2 --- /dev/null +++ b/tests/data/test550 @@ -0,0 +1,62 @@ +<testcase> +<info> +<keywords> +FTP +CURLOPT_PROXY_TRANSFER_MODE +CURLOPT_PROXY +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="1"> +HTTP/1.1 200 OK swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 + +hello +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> +<tool> +lib549 +</tool> + <name> +FPT RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ascii transfer + </name> +# first URL then proxy + <command> +ftp://www.haxx.se/moo/550 http://%HOSTIP:%HTTPPORT ascii +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET ftp://www.haxx.se/moo/550;type=a HTTP/1.1
+Host: www.haxx.se:21
+Pragma: no-cache
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +<stdout mode="text"> +hello +</stdout> +</verify> +</testcase> diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index e5f1c8588..1f9461fa2 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -48,7 +48,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \ lib507 lib508 lib509 lib510 lib511 lib512 lib513 lib514 lib515 lib516 \ lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527 \ lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \ - lib544 lib545 lib547 lib548 + lib544 lib545 lib547 lib548 lib549 # Dependencies (may need to be overriden) LDADD = $(LIBDIR)/libcurl.la @@ -143,3 +143,6 @@ lib547_SOURCES = lib547.c $(SUPPORTFILES) lib548_SOURCES = lib547.c $(SUPPORTFILES) lib548_CFLAGS = -DLIB548 + +lib549_SOURCES = lib549.c $(SUPPORTFILES) + diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c new file mode 100644 index 000000000..1ffef002b --- /dev/null +++ b/tests/libtest/lib549.c @@ -0,0 +1,48 @@ +/***************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * $Id$ + * + * argv1 = URL + * argv2 = proxy + * argv3 = non-zero means ASCII transfer + */ + +#include "test.h" + +int test(char *URL) +{ + CURLcode res; + CURL *curl; + + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + if ((curl = curl_easy_init()) == NULL) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg2); + curl_easy_setopt(curl, CURLOPT_URL, URL); + curl_easy_setopt(curl, CURLOPT_PROXY_TRANSFER_MODE, 1); + curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); + if(libtest_arg3) + /* enable ascii/text mode */ + curl_easy_setopt(curl, CURLOPT_TRANSFERTEXT, TRUE); + + res = curl_easy_perform(curl); + + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return (int)res; +} + |