diff options
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test1517 | 69 | ||||
| -rw-r--r-- | tests/libtest/Makefile.inc | 5 | ||||
| -rw-r--r-- | tests/libtest/lib1517.c | 115 |
4 files changed, 189 insertions, 2 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index bc0ee4ce3..002d39d42 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -151,7 +151,7 @@ test1436 test1437 \ \ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ -test1516 \ +test1516 test1517 \ \ test1520 \ \ diff --git a/tests/data/test1517 b/tests/data/test1517 new file mode 100644 index 000000000..d0a4aeca3 --- /dev/null +++ b/tests/data/test1517 @@ -0,0 +1,69 @@ +<testcase> +<info> +<keywords> +HTTP +POST +POST callback +slow callback +early response +</keywords> +</info> +# +# This reproduces issue #657, fixed with PR #668 - on Windows +# +# Server-side +<reply> +# Force server reply right after request headers, not waiting for request body +<servercmd> +skip: 45 +</servercmd> +<data> +HTTP/1.1 500 Internal Server Error +Date: Thu, 17 Mar 2016 14:41:00 GMT +Server: test-server/fake +Content-Type: text/plain; charset=US-ASCII +X-Special: swsclose +Content-Length: 55 +Connection: close + +This is a virtual description of server virtual error. +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1517 +</tool> + + <name> +HTTP POST, server responds before completed send + </name> + <command> +http://%HOSTIP:%HTTPPORT/1517 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strippart> +s/^(this is what we post to the silly web server)(\r)?\n// +</strippart> +<protocol> +POST /1517 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 45
+Content-Type: application/x-www-form-urlencoded
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 27d5ee98c..7ae66d797 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -21,7 +21,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \ lib583 lib585 lib586 lib587 lib590 lib591 lib597 lib598 lib599 \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ - lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 \ + lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \ lib1520 \ lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 \ lib1900 \ @@ -357,6 +357,9 @@ lib1515_SOURCES = lib1515.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1515_LDADD = $(TESTUTIL_LIBS) lib1515_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1515 +lib1517_SOURCES = lib1517.c $(SUPPORTFILES) +lib1517_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1517 + lib1520_SOURCES = lib1520.c $(SUPPORTFILES) lib1520_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1520 diff --git a/tests/libtest/lib1517.c b/tests/libtest/lib1517.c new file mode 100644 index 000000000..ad111ded4 --- /dev/null +++ b/tests/libtest/lib1517.c @@ -0,0 +1,115 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, 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[]="this is what we post to the silly web server\n"; + +struct WriteThis { + char *readptr; + size_t sizeleft; +}; + +static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) +{ + struct WriteThis *pooh = (struct WriteThis *)userp; + size_t tocopy = size * nmemb; + + /* Wait one second before return POST data * + * so libcurl will wait before sending request body */ + wait_ms(1000); + + if(tocopy < 1 || !pooh->sizeleft) + return 0; + + if(pooh->sizeleft < tocopy) + tocopy = pooh->sizeleft; + + memcpy(ptr, pooh->readptr, tocopy);/* copy requested data */ + pooh->readptr += tocopy; /* advance pointer */ + pooh->sizeleft -= tocopy; /* less data left */ + return tocopy; +} + +int test(char *URL) +{ + CURL *curl; + CURLcode res=CURLE_OK; + + struct WriteThis pooh; + + pooh.readptr = data; + pooh.sizeleft = strlen(data); + + 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; + } + + /* First set the URL that is about to receive our POST. */ + test_setopt(curl, CURLOPT_URL, URL); + + /* Now specify we want to POST data */ + test_setopt(curl, CURLOPT_POST, 1L); + +#ifdef CURL_DOES_CONVERSIONS + /* Convert the POST data to ASCII */ + test_setopt(curl, CURLOPT_TRANSFERTEXT, 1L); +#endif + + /* Set the expected POST size */ + test_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft); + + /* we want to use our own read function */ + test_setopt(curl, CURLOPT_READFUNCTION, read_callback); + + /* pointer to pass to our read function */ + test_setopt(curl, CURLOPT_READDATA, &pooh); + + /* get verbose debug output please */ + test_setopt(curl, CURLOPT_VERBOSE, 1L); + + /* include headers in the output */ + test_setopt(curl, CURLOPT_HEADER, 1L); + + /* detect HTTP error codes >= 400 */ + /* test_setopt(curl, CURLOPT_FAILONERROR, 1L); */ + + + /* Perform the request, res will get the return code */ + res = curl_easy_perform(curl); + +test_cleanup: + + /* always cleanup */ + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return res; +} |