diff options
Diffstat (limited to 'src/testcurl/test_get.c')
-rw-r--r-- | src/testcurl/test_get.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index a66a046c..0b8c577b 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -270,7 +270,12 @@ testExternalGet () | |||
270 | fd_set rs; | 270 | fd_set rs; |
271 | fd_set ws; | 271 | fd_set ws; |
272 | fd_set es; | 272 | fd_set es; |
273 | MHD_socket max; | 273 | MHD_socket maxsock; |
274 | #ifdef MHD_WINSOCK_SOCKETS | ||
275 | int maxposixs; /* Max socket number unused on W32 */ | ||
276 | #else /* MHD_POSIX_SOCKETS */ | ||
277 | #define maxposixs maxsock | ||
278 | #endif /* MHD_POSIX_SOCKETS */ | ||
274 | int running; | 279 | int running; |
275 | struct CURLMsg *msg; | 280 | struct CURLMsg *msg; |
276 | time_t start; | 281 | time_t start; |
@@ -319,12 +324,13 @@ testExternalGet () | |||
319 | start = time (NULL); | 324 | start = time (NULL); |
320 | while ((time (NULL) - start < 5) && (multi != NULL)) | 325 | while ((time (NULL) - start < 5) && (multi != NULL)) |
321 | { | 326 | { |
322 | max = 0; | 327 | maxsock = MHD_INVALID_SOCKET; |
328 | maxposixs = -1; | ||
323 | FD_ZERO (&rs); | 329 | FD_ZERO (&rs); |
324 | FD_ZERO (&ws); | 330 | FD_ZERO (&ws); |
325 | FD_ZERO (&es); | 331 | FD_ZERO (&es); |
326 | curl_multi_perform (multi, &running); | 332 | curl_multi_perform (multi, &running); |
327 | mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); | 333 | mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs); |
328 | if (mret != CURLM_OK) | 334 | if (mret != CURLM_OK) |
329 | { | 335 | { |
330 | curl_multi_remove_handle (multi, c); | 336 | curl_multi_remove_handle (multi, c); |
@@ -333,7 +339,7 @@ testExternalGet () | |||
333 | MHD_stop_daemon (d); | 339 | MHD_stop_daemon (d); |
334 | return 2048; | 340 | return 2048; |
335 | } | 341 | } |
336 | if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) | 342 | if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock)) |
337 | { | 343 | { |
338 | curl_multi_remove_handle (multi, c); | 344 | curl_multi_remove_handle (multi, c); |
339 | curl_multi_cleanup (multi); | 345 | curl_multi_cleanup (multi); |
@@ -343,7 +349,7 @@ testExternalGet () | |||
343 | } | 349 | } |
344 | tv.tv_sec = 0; | 350 | tv.tv_sec = 0; |
345 | tv.tv_usec = 1000; | 351 | tv.tv_usec = 1000; |
346 | select (max + 1, &rs, &ws, &es, &tv); | 352 | select (maxposixs + 1, &rs, &ws, &es, &tv); |
347 | curl_multi_perform (multi, &running); | 353 | curl_multi_perform (multi, &running); |
348 | if (running == 0) | 354 | if (running == 0) |
349 | { | 355 | { |