From 59c063dfd38972e06a7f3a0b8f94860a67acdc96 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 11 Nov 2004 23:11:04 +0000 Subject: Fix behaviour when passing NULL to CURLOPT_POSTFIELDS and CURLOPT_HTTPPOST. --- tests/data/Makefile.am | 2 +- tests/data/test515 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test516 | 45 +++++++++++++++++++++++++++++++++++++++++++++ tests/libtest/Makefile.am | 10 +++++++++- tests/libtest/lib515.c | 24 ++++++++++++++++++++++++ tests/libtest/lib516.c | 23 +++++++++++++++++++++++ 6 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 tests/data/test515 create mode 100644 tests/data/test516 create mode 100644 tests/libtest/lib515.c create mode 100644 tests/libtest/lib516.c (limited to 'tests') diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index cd1d82bd3..ccfc6e72e 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test172 test204 test205 test173 test174 test175 test176 test177 \ test513 test514 test178 test179 test180 test181 test182 test183 \ test184 test185 test186 test187 test188 test189 test191 test192 \ - test193 test194 test195 test196 test197 test198 + test193 test194 test195 test196 test197 test198 test515 test516 # The following tests have been removed from the dist since they no longer # work. We need to fix the test suite's FTPS server first, then bring them diff --git a/tests/data/test515 b/tests/data/test515 new file mode 100644 index 000000000..7e72858a3 --- /dev/null +++ b/tests/data/test515 @@ -0,0 +1,46 @@ +# +# Server-side + + +HTTP/1.1 200 OK swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake + +OK + + + +# Client-side + + +http + +# tool is what to use instead of 'curl' + +lib515 + + + +make a POSTFIELDS set to NULL with POSTFIELDSIZE set to zero + + +http://%HOSTIP:%HTTPPORT/515 + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +POST /515 HTTP/1.1 +Host: 127.0.0.1:%HTTPPORT +Pragma: no-cache +Accept: */* +Content-Length: 0 +Content-Type: application/x-www-form-urlencoded + + + diff --git a/tests/data/test516 b/tests/data/test516 new file mode 100644 index 000000000..568e46bb5 --- /dev/null +++ b/tests/data/test516 @@ -0,0 +1,45 @@ +# +# Server-side + + +HTTP/1.1 200 OK swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake + +OK + + + +# Client-side + + +http + +# tool is what to use instead of 'curl' + +lib516 + + + +make a HTTPPOST set to NULL + + +http://%HOSTIP:%HTTPPORT/516 + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +POST /516 HTTP/1.1 +Host: 127.0.0.1:%HTTPPORT +Pragma: no-cache +Accept: */* +Content-Length: 0 + + + diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 688c7a4b2..06fbe5519 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -39,7 +39,7 @@ SUPPORTFILES = first.c test.h # These are all libcurl test programs noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 \ - lib508 lib509 lib510 lib511 lib512 lib513 lib514 + lib508 lib509 lib510 lib511 lib512 lib513 lib514 lib515 lib516 lib500_SOURCES = lib500.c $(SUPPORTFILES) lib500_LDADD = $(LIBDIR)/libcurl.la @@ -100,3 +100,11 @@ lib513_DEPENDENCIES = $(LIBDIR)/libcurl.la lib514_SOURCES = lib514.c $(SUPPORTFILES) lib514_LDADD = $(LIBDIR)/libcurl.la lib514_DEPENDENCIES = $(LIBDIR)/libcurl.la + +lib515_SOURCES = lib515.c $(SUPPORTFILES) +lib515_LDADD = $(LIBDIR)/libcurl.la +lib515_DEPENDENCIES = $(LIBDIR)/libcurl.la + +lib516_SOURCES = lib516.c $(SUPPORTFILES) +lib516_LDADD = $(LIBDIR)/libcurl.la +lib516_DEPENDENCIES = $(LIBDIR)/libcurl.la diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c new file mode 100644 index 000000000..ce075110d --- /dev/null +++ b/tests/libtest/lib515.c @@ -0,0 +1,24 @@ +#include "test.h" + +int test(char *URL) +{ + CURL *curl; + CURLcode res=CURLE_OK; + + curl = curl_easy_init(); + if(curl) { + /* First set the URL that is about to receive our POST. */ + curl_easy_setopt(curl, CURLOPT_URL, URL); + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, NULL); + curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0); + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */ + curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */ + + /* Now, we should be making a zero byte POST request */ + res = curl_easy_perform(curl); + + /* always cleanup */ + curl_easy_cleanup(curl); + } + return (int)res; +} diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c new file mode 100644 index 000000000..6e71fb4bb --- /dev/null +++ b/tests/libtest/lib516.c @@ -0,0 +1,23 @@ +#include "test.h" + +int test(char *URL) +{ + CURL *curl; + CURLcode res=CURLE_OK; + + curl = curl_easy_init(); + if(curl) { + /* First set the URL that is about to receive our POST. */ + curl_easy_setopt(curl, CURLOPT_URL, URL); + curl_easy_setopt(curl, CURLOPT_HTTPPOST, NULL); + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); /* show verbose for debug */ + curl_easy_setopt(curl, CURLOPT_HEADER, 1); /* include header */ + + /* Now, we should be making a zero byte POST request */ + res = curl_easy_perform(curl); + + /* always cleanup */ + curl_easy_cleanup(curl); + } + return (int)res; +} -- cgit v1.2.3