From 5156982377d097490852a0fd47e74df0390f6a60 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 23 Jun 2015 17:51:03 -0700 Subject: [PATCH] test1531: verify POSTFIELDSIZE set after add_handle Following the fix made in 903b6e05565bf. --- tests/data/Makefile.inc | 2 +- tests/data/test1531 | Bin 0 -> 552 bytes tests/libtest/Makefile.inc | 6 +- tests/libtest/lib1531.c | 144 +++++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 tests/data/test1531 create mode 100644 tests/libtest/lib1531.c diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 73877c6785..88dafa4f9e 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -153,7 +153,7 @@ test1516 \ \ test1520 \ \ -test1525 test1526 test1527 test1528 test1529 test1530 \ +test1525 test1526 test1527 test1528 test1529 test1530 test1531 \ \ test1600 test1601 test1602 \ \ diff --git a/tests/data/test1531 b/tests/data/test1531 new file mode 100644 index 0000000000000000000000000000000000000000..d58deb6e0e34d4555cc60ffb312db66bf9bd07bf GIT binary patch literal 552 zc-n1JT}uNo5cD~4|6x&lDb%BgASE7%AGA>Dq33f+lRYn(%O1(r^ZfOu*0zE^gk)!S zXJ;UiF|t+>3n8tqDP3D}=M_$<^f~QM($XS1tbM0eZ^~tgTmJ0HatzLEiJ)c!oSuUTd{Acl@BRziti8HVav7wDK zutqS*s2L5UzH|UXpzw, 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 http://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 "testutil.h" +#include "warnless.h" +#include "memdebug.h" + +#define TEST_HANG_TIMEOUT 60 * 1000 + +char const testData[] = ".abc\0xyz"; +off_t const testDataSize = sizeof(testData) - 1; + +int test(char *URL) +{ + CURL *easy; + CURLM *multi_handle; + int still_running; /* keep number of running handles */ + CURLMsg *msg; /* for picking up messages with the transfer status */ + int msgs_left; /* how many messages are left */ + + /* Allocate one CURL handle per transfer */ + easy = curl_easy_init(); + + /* init a multi stack */ + multi_handle = curl_multi_init(); + + /* add the individual transfer */ + curl_multi_add_handle(multi_handle, easy); + + /* set the options (I left out a few, you'll get the point anyway) */ + curl_easy_setopt(easy, CURLOPT_URL, URL); + curl_easy_setopt(easy, CURLOPT_POSTFIELDSIZE_LARGE, testDataSize); + curl_easy_setopt(easy, CURLOPT_POSTFIELDS, testData); + + /* we start some action by calling perform right away */ + curl_multi_perform(multi_handle, &still_running); + + do { + struct timeval timeout; + int rc; /* select() return code */ + CURLMcode mc; /* curl_multi_fdset() return code */ + + fd_set fdread; + fd_set fdwrite; + fd_set fdexcep; + int maxfd = -1; + + long curl_timeo = -1; + + FD_ZERO(&fdread); + FD_ZERO(&fdwrite); + FD_ZERO(&fdexcep); + + /* set a suitable timeout to play around with */ + timeout.tv_sec = 1; + timeout.tv_usec = 0; + + curl_multi_timeout(multi_handle, &curl_timeo); + if(curl_timeo >= 0) { + timeout.tv_sec = curl_timeo / 1000; + if(timeout.tv_sec > 1) + timeout.tv_sec = 1; + else + timeout.tv_usec = (curl_timeo % 1000) * 1000; + } + + /* get file descriptors from the transfers */ + mc = curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd); + + if(mc != CURLM_OK) + { + fprintf(stderr, "curl_multi_fdset() failed, code %d.\n", mc); + break; + } + + /* On success the value of maxfd is guaranteed to be >= -1. We call + select(maxfd + 1, ...); specially in case of (maxfd == -1) there are + no fds ready yet so we call select(0, ...) --or Sleep() on Windows-- + to sleep 100ms, which is the minimum suggested value in the + curl_multi_fdset() doc. */ + + if(maxfd == -1) { +#ifdef _WIN32 + Sleep(100); + rc = 0; +#else + /* Portable sleep for platforms other than Windows. */ + struct timeval wait = { 0, 100 * 1000 }; /* 100ms */ + rc = select(0, NULL, NULL, NULL, &wait); +#endif + } + else { + /* Note that on some platforms 'timeout' may be modified by select(). + If you need access to the original value save a copy beforehand. */ + rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout); + } + + switch(rc) { + case -1: + /* select error */ + break; + case 0: /* timeout */ + default: /* action */ + curl_multi_perform(multi_handle, &still_running); + break; + } + } while(still_running); + + /* See how the transfers went */ + while ((msg = curl_multi_info_read(multi_handle, &msgs_left))) { + if (msg->msg == CURLMSG_DONE) { + printf("HTTP transfer completed with status %d\n", msg->data.result); + break; + } + } + + curl_multi_cleanup(multi_handle); + + /* Free the CURL handles */ + curl_easy_cleanup(easy); + + return 0; +} + -- 2.47.3