aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl/test_quiesce.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testcurl/test_quiesce.c')
-rw-r--r--src/testcurl/test_quiesce.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index 667f73e1..8ce09434 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -311,7 +311,12 @@ testExternalGet ()
311 fd_set rs; 311 fd_set rs;
312 fd_set ws; 312 fd_set ws;
313 fd_set es; 313 fd_set es;
314 MHD_socket max; 314 MHD_socket maxsock;
315#ifdef MHD_WINSOCK_SOCKETS
316 int maxposixs; /* Max socket number unused on W32 */
317#else /* MHD_POSIX_SOCKETS */
318#define maxposixs maxsock
319#endif /* MHD_POSIX_SOCKETS */
315 int running; 320 int running;
316 struct CURLMsg *msg; 321 struct CURLMsg *msg;
317 time_t start; 322 time_t start;
@@ -349,12 +354,13 @@ testExternalGet ()
349 start = time (NULL); 354 start = time (NULL);
350 while ((time (NULL) - start < 5) && (multi != NULL)) 355 while ((time (NULL) - start < 5) && (multi != NULL))
351 { 356 {
352 max = 0; 357 maxsock = MHD_INVALID_SOCKET;
358 maxposixs = -1;
353 FD_ZERO (&rs); 359 FD_ZERO (&rs);
354 FD_ZERO (&ws); 360 FD_ZERO (&ws);
355 FD_ZERO (&es); 361 FD_ZERO (&es);
356 curl_multi_perform (multi, &running); 362 curl_multi_perform (multi, &running);
357 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 363 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
358 if (mret != CURLM_OK) 364 if (mret != CURLM_OK)
359 { 365 {
360 curl_multi_remove_handle (multi, c); 366 curl_multi_remove_handle (multi, c);
@@ -363,7 +369,7 @@ testExternalGet ()
363 MHD_stop_daemon (d); 369 MHD_stop_daemon (d);
364 return 2048; 370 return 2048;
365 } 371 }
366 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 372 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
367 { 373 {
368 curl_multi_remove_handle (multi, c); 374 curl_multi_remove_handle (multi, c);
369 curl_multi_cleanup (multi); 375 curl_multi_cleanup (multi);
@@ -373,7 +379,7 @@ testExternalGet ()
373 } 379 }
374 tv.tv_sec = 0; 380 tv.tv_sec = 0;
375 tv.tv_usec = 1000; 381 tv.tv_usec = 1000;
376 select (max + 1, &rs, &ws, &es, &tv); 382 select (maxposixs + 1, &rs, &ws, &es, &tv);
377 curl_multi_perform (multi, &running); 383 curl_multi_perform (multi, &running);
378 if (running == 0) 384 if (running == 0)
379 { 385 {