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