diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-10-22 18:49:38 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-10-28 12:13:07 +0300 |
commit | f5d7b2fc925e4ba7c2268cb77b754a2fe19d5f13 (patch) | |
tree | 3853f7439d413ec66d7bc7d314d9a50c605cff0b | |
parent | b44b4f73dd5e3920983f885722a4b7a572b41e10 (diff) | |
download | libmicrohttpd-f5d7b2fc925e4ba7c2268cb77b754a2fe19d5f13.tar.gz libmicrohttpd-f5d7b2fc925e4ba7c2268cb77b754a2fe19d5f13.zip |
test_head: check libcurl for timeout value
-rw-r--r-- | src/testcurl/test_head.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/testcurl/test_head.c b/src/testcurl/test_head.c index 27daf66e..3c984125 100644 --- a/src/testcurl/test_head.c +++ b/src/testcurl/test_head.c | |||
@@ -612,6 +612,15 @@ performQueryExternal (struct MHD_Daemon *d, CURL *c, CURLM **multi_reuse) | |||
612 | mhdErrorExitDesc ("MHD_get_fdset() failed"); | 612 | mhdErrorExitDesc ("MHD_get_fdset() failed"); |
613 | tv.tv_sec = 0; | 613 | tv.tv_sec = 0; |
614 | tv.tv_usec = 200000; | 614 | tv.tv_usec = 200000; |
615 | if (0 == MHD_get_timeout64s (d)) | ||
616 | tv.tv_usec = 0; | ||
617 | else | ||
618 | { | ||
619 | long curl_to = -1; | ||
620 | curl_multi_timeout (multi, &curl_to); | ||
621 | if (0 == curl_to) | ||
622 | tv.tv_usec = 0; | ||
623 | } | ||
615 | #ifdef MHD_POSIX_SOCKETS | 624 | #ifdef MHD_POSIX_SOCKETS |
616 | if (maxMhdSk > maxCurlSk) | 625 | if (maxMhdSk > maxCurlSk) |
617 | maxCurlSk = maxMhdSk; | 626 | maxCurlSk = maxMhdSk; |
@@ -625,7 +634,7 @@ performQueryExternal (struct MHD_Daemon *d, CURL *c, CURLM **multi_reuse) | |||
625 | if ((WSAEINVAL != WSAGetLastError ()) || | 634 | if ((WSAEINVAL != WSAGetLastError ()) || |
626 | (0 != rs.fd_count) || (0 != ws.fd_count) || (0 != es.fd_count) ) | 635 | (0 != rs.fd_count) || (0 != ws.fd_count) || (0 != es.fd_count) ) |
627 | externalErrorExitDesc ("Unexpected select() error"); | 636 | externalErrorExitDesc ("Unexpected select() error"); |
628 | Sleep (200); | 637 | Sleep ((unsigned long) tv.tv_usec / 1000); |
629 | #endif | 638 | #endif |
630 | } | 639 | } |
631 | if (MHD_YES != MHD_run_from_select (d, &rs, &ws, &es)) | 640 | if (MHD_YES != MHD_run_from_select (d, &rs, &ws, &es)) |