diff options
Diffstat (limited to 'src/testcurl/test_process_headers.c')
-rw-r--r-- | src/testcurl/test_process_headers.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c index 4875b440..e13851fa 100644 --- a/src/testcurl/test_process_headers.c +++ b/src/testcurl/test_process_headers.c | |||
@@ -305,7 +305,12 @@ testExternalGet () | |||
305 | fd_set rs; | 305 | fd_set rs; |
306 | fd_set ws; | 306 | fd_set ws; |
307 | fd_set es; | 307 | fd_set es; |
308 | MHD_socket max; | 308 | MHD_socket maxsock; |
309 | #ifdef MHD_WINSOCK_SOCKETS | ||
310 | int maxposixs; /* Max socket number unused on W32 */ | ||
311 | #else /* MHD_POSIX_SOCKETS */ | ||
312 | #define maxposixs maxsock | ||
313 | #endif /* MHD_POSIX_SOCKETS */ | ||
309 | int running; | 314 | int running; |
310 | struct CURLMsg *msg; | 315 | struct CURLMsg *msg; |
311 | time_t start; | 316 | time_t start; |
@@ -354,12 +359,13 @@ testExternalGet () | |||
354 | start = time (NULL); | 359 | start = time (NULL); |
355 | while ((time (NULL) - start < 5) && (multi != NULL)) | 360 | while ((time (NULL) - start < 5) && (multi != NULL)) |
356 | { | 361 | { |
357 | max = 0; | 362 | maxsock = MHD_INVALID_SOCKET; |
363 | maxposixs = -1; | ||
358 | FD_ZERO (&rs); | 364 | FD_ZERO (&rs); |
359 | FD_ZERO (&ws); | 365 | FD_ZERO (&ws); |
360 | FD_ZERO (&es); | 366 | FD_ZERO (&es); |
361 | curl_multi_perform (multi, &running); | 367 | curl_multi_perform (multi, &running); |
362 | mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); | 368 | mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs); |
363 | if (mret != CURLM_OK) | 369 | if (mret != CURLM_OK) |
364 | { | 370 | { |
365 | curl_multi_remove_handle (multi, c); | 371 | curl_multi_remove_handle (multi, c); |
@@ -368,7 +374,7 @@ testExternalGet () | |||
368 | MHD_stop_daemon (d); | 374 | MHD_stop_daemon (d); |
369 | return 2048; | 375 | return 2048; |
370 | } | 376 | } |
371 | if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) | 377 | if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock)) |
372 | { | 378 | { |
373 | curl_multi_remove_handle (multi, c); | 379 | curl_multi_remove_handle (multi, c); |
374 | curl_multi_cleanup (multi); | 380 | curl_multi_cleanup (multi); |
@@ -378,7 +384,7 @@ testExternalGet () | |||
378 | } | 384 | } |
379 | tv.tv_sec = 0; | 385 | tv.tv_sec = 0; |
380 | tv.tv_usec = 1000; | 386 | tv.tv_usec = 1000; |
381 | select (max + 1, &rs, &ws, &es, &tv); | 387 | select (maxposixs + 1, &rs, &ws, &es, &tv); |
382 | curl_multi_perform (multi, &running); | 388 | curl_multi_perform (multi, &running); |
383 | if (running == 0) | 389 | if (running == 0) |
384 | { | 390 | { |