diff options
author | Daniel Stenberg <daniel@haxx.se> | 2007-09-26 12:00:01 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2007-09-26 12:00:01 +0000 |
commit | a6315359d742bdf967ba3ee1db3e0b7e5a3956fe (patch) | |
tree | c576f8ea1123ab16f7328baeb0db5ac629563649 /tests | |
parent | 966130132f75e0c30b176281081721bcb19e234d (diff) |
Max Katsev reported that when doing a libcurl FTP request with
CURLOPT_NOBODY enabled but not CURLOPT_HEADER, libcurl wouldn't do TYPE
before it does SIZE which makes it less useful. I walked over the code and
made it do this properly, and added test case 542 to verify it.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/data/test542 | 57 | ||||
-rw-r--r-- | tests/libtest/Makefile.am | 4 | ||||
-rw-r--r-- | tests/libtest/lib542.c | 74 |
3 files changed, 134 insertions, 1 deletions
diff --git a/tests/data/test542 b/tests/data/test542 new file mode 100644 index 000000000..5afe12470 --- /dev/null +++ b/tests/data/test542 @@ -0,0 +1,57 @@ +<testcase> +<info> +<keywords> +FTP +PASV +RETR +</keywords> +</info> +# Server-side +<reply> +<data> +data + to + see +that FTP +works + so does it? +</data> +<datacheck> +Content-Length: 51
+Accept-ranges: bytes
+</datacheck> +</reply> + +# Client-side +<client> +<server> +ftp +</server> +<tool> +lib542 +</tool> + <name> +FTP a file with NOBODY yes and HEADER no + </name> + <command> +ftp://%HOSTIP:%FTPPORT/542 +</command> + +</client> + +# Verify data after the test has been "shot" +# +# There's no MTDM in the protocol here since this code doesn't ask for the +# time/date of the file +<verify> +<protocol> +USER anonymous
+PASS ftp@example.com
+PWD
+TYPE I
+SIZE 542
+REST 0
+QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index dc55afce7..395564a6e 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -47,7 +47,7 @@ SUPPORTFILES = first.c test.h 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 + lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 # Dependencies (may need to be overriden) LDADD = $(LIBDIR)/libcurl.la @@ -128,3 +128,5 @@ lib537_SOURCES = lib537.c $(SUPPORTFILES) lib540_SOURCES = lib540.c $(SUPPORTFILES) lib541_SOURCES = lib541.c $(SUPPORTFILES) + +lib542_SOURCES = lib542.c $(SUPPORTFILES) diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c new file mode 100644 index 000000000..6aee9013f --- /dev/null +++ b/tests/libtest/lib542.c @@ -0,0 +1,74 @@ +/***************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * $Id$ + */ + +#include "setup.h" /* struct_stat etc. */ +#include "test.h" + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +/* + * FTP get with NOBODY but no HEADER + */ + +int test(char *URL) +{ + CURL *curl; + CURLcode res = CURLE_OK; + FILE *hd_src ; + + if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + fclose(hd_src); + return TEST_ERR_MAJOR_BAD; + } + + /* get a curl handle */ + if ((curl = curl_easy_init()) == NULL) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + fclose(hd_src); + return TEST_ERR_MAJOR_BAD; + } + + /* enable verbose */ + curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE) ; + + /* enable NOBODY */ + curl_easy_setopt(curl, CURLOPT_NOBODY, TRUE) ; + + /* disable HEADER */ + curl_easy_setopt(curl, CURLOPT_HEADER, FALSE) ; + + /* specify target */ + curl_easy_setopt(curl,CURLOPT_URL, URL); + + /* Now run off and do what you've been told! */ + res = curl_easy_perform(curl); + + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return res; +} |