aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-02-05 20:47:54 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-02-05 20:47:54 +0000
commitbc162a8e859d360d77f57df8fdf5a8daf746e72d (patch)
tree85f2fb607dba0c97c9f041c6fe8c15f311af8aab
parent868e81cb3d2c98d2116e65da44858d1d0d009759 (diff)
downloadlibmicrohttpd-bc162a8e859d360d77f57df8fdf5a8daf746e72d.tar.gz
libmicrohttpd-bc162a8e859d360d77f57df8fdf5a8daf746e72d.zip
Fixed test compilation warnings for native W32 x64
Diffstat
-rw-r--r--src/testcurl/perf_get.c16
-rw-r--r--src/testcurl/test_callback.c16
-rw-r--r--src/testcurl/test_get.c16
-rw-r--r--src/testcurl/test_get_chunked.c16
-rw-r--r--src/testcurl/test_get_sendfile.c16
-rw-r--r--src/testcurl/test_large_put.c16
-rw-r--r--src/testcurl/test_parse_cookies.c16
-rw-r--r--src/testcurl/test_post.c16
-rw-r--r--src/testcurl/test_post_loop.c16
-rw-r--r--src/testcurl/test_postform.c16
-rw-r--r--src/testcurl/test_process_arguments.c16
-rw-r--r--src/testcurl/test_process_headers.c16
-rw-r--r--src/testcurl/test_put.c16
-rw-r--r--src/testcurl/test_put_chunked.c16
-rw-r--r--src/testcurl/test_quiesce.c16
15 files changed, 165 insertions, 75 deletions
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index 651bc36e..7ed706b7 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -368,7 +368,12 @@ testExternalGet (int port)
368 fd_set rs; 368 fd_set rs;
369 fd_set ws; 369 fd_set ws;
370 fd_set es; 370 fd_set es;
371 MHD_socket max; 371 MHD_socket maxsock;
372#ifdef MHD_WINSOCK_SOCKETS
373 int maxposixs; /* Max socket number unused on W32 */
374#else /* MHD_POSIX_SOCKETS */
375#define maxposixs maxsock
376#endif /* MHD_POSIX_SOCKETS */
372 int running; 377 int running;
373 struct CURLMsg *msg; 378 struct CURLMsg *msg;
374 time_t start; 379 time_t start;
@@ -421,12 +426,13 @@ testExternalGet (int port)
421 start = time (NULL); 426 start = time (NULL);
422 while ((time (NULL) - start < 5) && (c != NULL)) 427 while ((time (NULL) - start < 5) && (c != NULL))
423 { 428 {
424 max = 0; 429 maxsock = MHD_INVALID_SOCKET;
430 maxposixs = -1;
425 FD_ZERO (&rs); 431 FD_ZERO (&rs);
426 FD_ZERO (&ws); 432 FD_ZERO (&ws);
427 FD_ZERO (&es); 433 FD_ZERO (&es);
428 curl_multi_perform (multi, &running); 434 curl_multi_perform (multi, &running);
429 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 435 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
430 if (mret != CURLM_OK) 436 if (mret != CURLM_OK)
431 { 437 {
432 curl_multi_remove_handle (multi, c); 438 curl_multi_remove_handle (multi, c);
@@ -435,7 +441,7 @@ testExternalGet (int port)
435 MHD_stop_daemon (d); 441 MHD_stop_daemon (d);
436 return 2048; 442 return 2048;
437 } 443 }
438 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 444 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
439 { 445 {
440 curl_multi_remove_handle (multi, c); 446 curl_multi_remove_handle (multi, c);
441 curl_multi_cleanup (multi); 447 curl_multi_cleanup (multi);
@@ -445,7 +451,7 @@ testExternalGet (int port)
445 } 451 }
446 tv.tv_sec = 0; 452 tv.tv_sec = 0;
447 tv.tv_usec = 1000; 453 tv.tv_usec = 1000;
448 select (max + 1, &rs, &ws, &es, &tv); 454 select (maxposixs + 1, &rs, &ws, &es, &tv);
449 curl_multi_perform (multi, &running); 455 curl_multi_perform (multi, &running);
450 if (running == 0) 456 if (running == 0)
451 { 457 {
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c
index dc40aa53..a987aac1 100644
--- a/src/testcurl/test_callback.c
+++ b/src/testcurl/test_callback.c
@@ -93,7 +93,12 @@ main(int argc, char **argv)
93 fd_set rs; 93 fd_set rs;
94 fd_set ws; 94 fd_set ws;
95 fd_set es; 95 fd_set es;
96 MHD_socket max; 96 MHD_socket maxsock;
97#ifdef MHD_WINSOCK_SOCKETS
98 int maxposixs; /* Max socket number unused on W32 */
99#else /* MHD_POSIX_SOCKETS */
100#define maxposixs maxsock
101#endif /* MHD_POSIX_SOCKETS */
97 CURL *c; 102 CURL *c;
98 CURLM *multi; 103 CURLM *multi;
99 CURLMcode mret; 104 CURLMcode mret;
@@ -135,14 +140,15 @@ main(int argc, char **argv)
135 extra = 10; 140 extra = 10;
136 while ( (c != NULL) || (--extra > 0) ) 141 while ( (c != NULL) || (--extra > 0) )
137 { 142 {
138 max = MHD_INVALID_SOCKET; 143 maxsock = MHD_INVALID_SOCKET;
144 maxposixs = -1;
139 FD_ZERO(&ws); 145 FD_ZERO(&ws);
140 FD_ZERO(&rs); 146 FD_ZERO(&rs);
141 FD_ZERO(&es); 147 FD_ZERO(&es);
142 curl_multi_perform (multi, &running); 148 curl_multi_perform (multi, &running);
143 if (NULL != multi) 149 if (NULL != multi)
144 { 150 {
145 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 151 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
146 if (mret != CURLM_OK) 152 if (mret != CURLM_OK)
147 { 153 {
148 curl_multi_remove_handle (multi, c); 154 curl_multi_remove_handle (multi, c);
@@ -153,7 +159,7 @@ main(int argc, char **argv)
153 } 159 }
154 } 160 }
155 if (MHD_YES != 161 if (MHD_YES !=
156 MHD_get_fdset(d, &rs, &ws, &es, &max)) 162 MHD_get_fdset(d, &rs, &ws, &es, &maxsock))
157 { 163 {
158 curl_multi_remove_handle (multi, c); 164 curl_multi_remove_handle (multi, c);
159 curl_multi_cleanup (multi); 165 curl_multi_cleanup (multi);
@@ -163,7 +169,7 @@ main(int argc, char **argv)
163 } 169 }
164 tv.tv_sec = 0; 170 tv.tv_sec = 0;
165 tv.tv_usec = 1000; 171 tv.tv_usec = 1000;
166 select(max + 1, &rs, &ws, &es, &tv); 172 select(maxposixs + 1, &rs, &ws, &es, &tv);
167 if (NULL != multi) 173 if (NULL != multi)
168 { 174 {
169 curl_multi_perform (multi, &running); 175 curl_multi_perform (multi, &running);
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 {
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c
index 6efe2f5e..003b6a58 100644
--- a/src/testcurl/test_get_chunked.c
+++ b/src/testcurl/test_get_chunked.c
@@ -291,7 +291,12 @@ testExternalGet ()
291 fd_set rs; 291 fd_set rs;
292 fd_set ws; 292 fd_set ws;
293 fd_set es; 293 fd_set es;
294 MHD_socket max; 294 MHD_socket maxsock;
295#ifdef MHD_WINSOCK_SOCKETS
296 int maxposixs; /* Max socket number unused on W32 */
297#else /* MHD_POSIX_SOCKETS */
298#define maxposixs maxsock
299#endif /* MHD_POSIX_SOCKETS */
295 int running; 300 int running;
296 struct CURLMsg *msg; 301 struct CURLMsg *msg;
297 time_t start; 302 time_t start;
@@ -337,12 +342,13 @@ testExternalGet ()
337 start = time (NULL); 342 start = time (NULL);
338 while ((time (NULL) - start < 5) && (multi != NULL)) 343 while ((time (NULL) - start < 5) && (multi != NULL))
339 { 344 {
340 max = 0; 345 maxsock = MHD_INVALID_SOCKET;
346 maxposixs = -1;
341 FD_ZERO (&rs); 347 FD_ZERO (&rs);
342 FD_ZERO (&ws); 348 FD_ZERO (&ws);
343 FD_ZERO (&es); 349 FD_ZERO (&es);
344 curl_multi_perform (multi, &running); 350 curl_multi_perform (multi, &running);
345 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 351 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
346 if (mret != CURLM_OK) 352 if (mret != CURLM_OK)
347 { 353 {
348 curl_multi_remove_handle (multi, c); 354 curl_multi_remove_handle (multi, c);
@@ -351,7 +357,7 @@ testExternalGet ()
351 MHD_stop_daemon (d); 357 MHD_stop_daemon (d);
352 return 2048; 358 return 2048;
353 } 359 }
354 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 360 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
355 { 361 {
356 curl_multi_remove_handle (multi, c); 362 curl_multi_remove_handle (multi, c);
357 curl_multi_cleanup (multi); 363 curl_multi_cleanup (multi);
@@ -361,7 +367,7 @@ testExternalGet ()
361 } 367 }
362 tv.tv_sec = 0; 368 tv.tv_sec = 0;
363 tv.tv_usec = 1000; 369 tv.tv_usec = 1000;
364 select (max + 1, &rs, &ws, &es, &tv); 370 select (maxposixs + 1, &rs, &ws, &es, &tv);
365 curl_multi_perform (multi, &running); 371 curl_multi_perform (multi, &running);
366 if (running == 0) 372 if (running == 0)
367 { 373 {
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index 36f29b27..8db2c3aa 100644
--- a/src/testcurl/test_get_sendfile.c
+++ b/src/testcurl/test_get_sendfile.c
@@ -276,7 +276,12 @@ testExternalGet ()
276 fd_set rs; 276 fd_set rs;
277 fd_set ws; 277 fd_set ws;
278 fd_set es; 278 fd_set es;
279 MHD_socket max; 279 MHD_socket maxsock;
280#ifdef MHD_WINSOCK_SOCKETS
281 int maxposixs; /* Max socket number unused on W32 */
282#else /* MHD_POSIX_SOCKETS */
283#define maxposixs maxsock
284#endif /* MHD_POSIX_SOCKETS */
280 int running; 285 int running;
281 struct CURLMsg *msg; 286 struct CURLMsg *msg;
282 time_t start; 287 time_t start;
@@ -325,12 +330,13 @@ testExternalGet ()
325 start = time (NULL); 330 start = time (NULL);
326 while ((time (NULL) - start < 5) && (multi != NULL)) 331 while ((time (NULL) - start < 5) && (multi != NULL))
327 { 332 {
328 max = 0; 333 maxsock = MHD_INVALID_SOCKET;
334 maxposixs = -1;
329 FD_ZERO (&rs); 335 FD_ZERO (&rs);
330 FD_ZERO (&ws); 336 FD_ZERO (&ws);
331 FD_ZERO (&es); 337 FD_ZERO (&es);
332 curl_multi_perform (multi, &running); 338 curl_multi_perform (multi, &running);
333 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 339 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
334 if (mret != CURLM_OK) 340 if (mret != CURLM_OK)
335 { 341 {
336 curl_multi_remove_handle (multi, c); 342 curl_multi_remove_handle (multi, c);
@@ -339,7 +345,7 @@ testExternalGet ()
339 MHD_stop_daemon (d); 345 MHD_stop_daemon (d);
340 return 2048; 346 return 2048;
341 } 347 }
342 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 348 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
343 { 349 {
344 curl_multi_remove_handle (multi, c); 350 curl_multi_remove_handle (multi, c);
345 curl_multi_cleanup (multi); 351 curl_multi_cleanup (multi);
@@ -349,7 +355,7 @@ testExternalGet ()
349 } 355 }
350 tv.tv_sec = 0; 356 tv.tv_sec = 0;
351 tv.tv_usec = 1000; 357 tv.tv_usec = 1000;
352 select (max + 1, &rs, &ws, &es, &tv); 358 select (maxposixs + 1, &rs, &ws, &es, &tv);
353 curl_multi_perform (multi, &running); 359 curl_multi_perform (multi, &running);
354 if (running == 0) 360 if (running == 0)
355 { 361 {
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index 37b94348..de635172 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -330,7 +330,12 @@ testExternalPut ()
330 fd_set rs; 330 fd_set rs;
331 fd_set ws; 331 fd_set ws;
332 fd_set es; 332 fd_set es;
333 MHD_socket max; 333 MHD_socket maxsock;
334#ifdef MHD_WINSOCK_SOCKETS
335 int maxposixs; /* Max socket number unused on W32 */
336#else /* MHD_POSIX_SOCKETS */
337#define maxposixs maxsock
338#endif /* MHD_POSIX_SOCKETS */
334 int running; 339 int running;
335 struct CURLMsg *msg; 340 struct CURLMsg *msg;
336 time_t start; 341 time_t start;
@@ -389,12 +394,13 @@ testExternalPut ()
389 start = time (NULL); 394 start = time (NULL);
390 while ((time (NULL) - start < 5) && (multi != NULL)) 395 while ((time (NULL) - start < 5) && (multi != NULL))
391 { 396 {
392 max = 0; 397 maxsock = MHD_INVALID_SOCKET;
398 maxposixs = -1;
393 FD_ZERO (&rs); 399 FD_ZERO (&rs);
394 FD_ZERO (&ws); 400 FD_ZERO (&ws);
395 FD_ZERO (&es); 401 FD_ZERO (&es);
396 curl_multi_perform (multi, &running); 402 curl_multi_perform (multi, &running);
397 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 403 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
398 if (mret != CURLM_OK) 404 if (mret != CURLM_OK)
399 { 405 {
400 curl_multi_remove_handle (multi, c); 406 curl_multi_remove_handle (multi, c);
@@ -403,7 +409,7 @@ testExternalPut ()
403 MHD_stop_daemon (d); 409 MHD_stop_daemon (d);
404 return 2048; 410 return 2048;
405 } 411 }
406 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 412 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
407 { 413 {
408 curl_multi_remove_handle (multi, c); 414 curl_multi_remove_handle (multi, c);
409 curl_multi_cleanup (multi); 415 curl_multi_cleanup (multi);
@@ -413,7 +419,7 @@ testExternalPut ()
413 } 419 }
414 tv.tv_sec = 0; 420 tv.tv_sec = 0;
415 tv.tv_usec = 1000; 421 tv.tv_usec = 1000;
416 select (max + 1, &rs, &ws, &es, &tv); 422 select (maxposixs + 1, &rs, &ws, &es, &tv);
417 curl_multi_perform (multi, &running); 423 curl_multi_perform (multi, &running);
418 if (running == 0) 424 if (running == 0)
419 { 425 {
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c
index ed654024..613148aa 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -117,7 +117,12 @@ testExternalGet ()
117 fd_set rs; 117 fd_set rs;
118 fd_set ws; 118 fd_set ws;
119 fd_set es; 119 fd_set es;
120 MHD_socket max; 120 MHD_socket maxsock;
121#ifdef MHD_WINSOCK_SOCKETS
122 int maxposixs; /* Max socket number unused on W32 */
123#else /* MHD_POSIX_SOCKETS */
124#define maxposixs maxsock
125#endif /* MHD_POSIX_SOCKETS */
121 int running; 126 int running;
122 struct CURLMsg *msg; 127 struct CURLMsg *msg;
123 time_t start; 128 time_t start;
@@ -171,12 +176,13 @@ testExternalGet ()
171 start = time (NULL); 176 start = time (NULL);
172 while ((time (NULL) - start < 5) && (multi != NULL)) 177 while ((time (NULL) - start < 5) && (multi != NULL))
173 { 178 {
174 max = 0; 179 maxsock = MHD_INVALID_SOCKET;
180 maxposixs = -1;
175 FD_ZERO (&rs); 181 FD_ZERO (&rs);
176 FD_ZERO (&ws); 182 FD_ZERO (&ws);
177 FD_ZERO (&es); 183 FD_ZERO (&es);
178 curl_multi_perform (multi, &running); 184 curl_multi_perform (multi, &running);
179 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 185 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
180 if (mret != CURLM_OK) 186 if (mret != CURLM_OK)
181 { 187 {
182 curl_multi_remove_handle (multi, c); 188 curl_multi_remove_handle (multi, c);
@@ -185,7 +191,7 @@ testExternalGet ()
185 MHD_stop_daemon (d); 191 MHD_stop_daemon (d);
186 return 2048; 192 return 2048;
187 } 193 }
188 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 194 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
189 { 195 {
190 curl_multi_remove_handle (multi, c); 196 curl_multi_remove_handle (multi, c);
191 curl_multi_cleanup (multi); 197 curl_multi_cleanup (multi);
@@ -195,7 +201,7 @@ testExternalGet ()
195 } 201 }
196 tv.tv_sec = 0; 202 tv.tv_sec = 0;
197 tv.tv_usec = 1000; 203 tv.tv_usec = 1000;
198 select (max + 1, &rs, &ws, &es, &tv); 204 select (maxposixs + 1, &rs, &ws, &es, &tv);
199 curl_multi_perform (multi, &running); 205 curl_multi_perform (multi, &running);
200 if (running == 0) 206 if (running == 0)
201 { 207 {
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index ad44791f..49074bf3 100644
--- a/src/testcurl/test_post.c
+++ b/src/testcurl/test_post.c
@@ -333,7 +333,12 @@ testExternalPost ()
333 fd_set rs; 333 fd_set rs;
334 fd_set ws; 334 fd_set ws;
335 fd_set es; 335 fd_set es;
336 MHD_socket max; 336 MHD_socket maxsock;
337#ifdef MHD_WINSOCK_SOCKETS
338 int maxposixs; /* Max socket number unused on W32 */
339#else /* MHD_POSIX_SOCKETS */
340#define maxposixs maxsock
341#endif /* MHD_POSIX_SOCKETS */
337 int running; 342 int running;
338 struct CURLMsg *msg; 343 struct CURLMsg *msg;
339 time_t start; 344 time_t start;
@@ -387,12 +392,13 @@ testExternalPost ()
387 start = time (NULL); 392 start = time (NULL);
388 while ((time (NULL) - start < 5) && (multi != NULL)) 393 while ((time (NULL) - start < 5) && (multi != NULL))
389 { 394 {
390 max = 0; 395 maxsock = MHD_INVALID_SOCKET;
396 maxposixs = -1;
391 FD_ZERO (&rs); 397 FD_ZERO (&rs);
392 FD_ZERO (&ws); 398 FD_ZERO (&ws);
393 FD_ZERO (&es); 399 FD_ZERO (&es);
394 curl_multi_perform (multi, &running); 400 curl_multi_perform (multi, &running);
395 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 401 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
396 if (mret != CURLM_OK) 402 if (mret != CURLM_OK)
397 { 403 {
398 curl_multi_remove_handle (multi, c); 404 curl_multi_remove_handle (multi, c);
@@ -401,7 +407,7 @@ testExternalPost ()
401 MHD_stop_daemon (d); 407 MHD_stop_daemon (d);
402 return 2048; 408 return 2048;
403 } 409 }
404 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 410 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
405 { 411 {
406 curl_multi_remove_handle (multi, c); 412 curl_multi_remove_handle (multi, c);
407 curl_multi_cleanup (multi); 413 curl_multi_cleanup (multi);
@@ -411,7 +417,7 @@ testExternalPost ()
411 } 417 }
412 tv.tv_sec = 0; 418 tv.tv_sec = 0;
413 tv.tv_usec = 1000; 419 tv.tv_usec = 1000;
414 select (max + 1, &rs, &ws, &es, &tv); 420 select (maxposixs + 1, &rs, &ws, &es, &tv);
415 curl_multi_perform (multi, &running); 421 curl_multi_perform (multi, &running);
416 if (running == 0) 422 if (running == 0)
417 { 423 {
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c
index 4fd632f5..0dad0153 100644
--- a/src/testcurl/test_post_loop.c
+++ b/src/testcurl/test_post_loop.c
@@ -311,7 +311,12 @@ testExternalPost ()
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;
@@ -371,13 +376,14 @@ testExternalPost ()
371 start = time (NULL); 376 start = time (NULL);
372 while ((time (NULL) - start < 5) && (multi != NULL)) 377 while ((time (NULL) - start < 5) && (multi != NULL))
373 { 378 {
374 max = 0; 379 maxsock = MHD_INVALID_SOCKET;
380 maxposixs = -1;
375 FD_ZERO (&rs); 381 FD_ZERO (&rs);
376 FD_ZERO (&ws); 382 FD_ZERO (&ws);
377 FD_ZERO (&es); 383 FD_ZERO (&es);
378 while (CURLM_CALL_MULTI_PERFORM == 384 while (CURLM_CALL_MULTI_PERFORM ==
379 curl_multi_perform (multi, &running)); 385 curl_multi_perform (multi, &running));
380 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 386 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
381 if (mret != CURLM_OK) 387 if (mret != CURLM_OK)
382 { 388 {
383 curl_multi_remove_handle (multi, c); 389 curl_multi_remove_handle (multi, c);
@@ -386,7 +392,7 @@ testExternalPost ()
386 MHD_stop_daemon (d); 392 MHD_stop_daemon (d);
387 return 2048; 393 return 2048;
388 } 394 }
389 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 395 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
390 { 396 {
391 curl_multi_remove_handle (multi, c); 397 curl_multi_remove_handle (multi, c);
392 curl_multi_cleanup (multi); 398 curl_multi_cleanup (multi);
@@ -403,7 +409,7 @@ testExternalPost ()
403 timeout = 0; /* terminate quickly... */ 409 timeout = 0; /* terminate quickly... */
404 tv.tv_sec = timeout / 1000; 410 tv.tv_sec = timeout / 1000;
405 tv.tv_usec = (timeout % 1000) * 1000; 411 tv.tv_usec = (timeout % 1000) * 1000;
406 if (-1 == select (max + 1, &rs, &ws, &es, &tv)) 412 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
407 { 413 {
408 if (EINTR == errno) 414 if (EINTR == errno)
409 continue; 415 continue;
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c
index 58b93b72..e45b3131 100644
--- a/src/testcurl/test_postform.c
+++ b/src/testcurl/test_postform.c
@@ -351,7 +351,12 @@ testExternalPost ()
351 fd_set rs; 351 fd_set rs;
352 fd_set ws; 352 fd_set ws;
353 fd_set es; 353 fd_set es;
354 MHD_socket max; 354 MHD_socket maxsock;
355#ifdef MHD_WINSOCK_SOCKETS
356 int maxposixs; /* Max socket number unused on W32 */
357#else /* MHD_POSIX_SOCKETS */
358#define maxposixs maxsock
359#endif /* MHD_POSIX_SOCKETS */
355 int running; 360 int running;
356 struct CURLMsg *msg; 361 struct CURLMsg *msg;
357 time_t start; 362 time_t start;
@@ -407,12 +412,13 @@ testExternalPost ()
407 start = time (NULL); 412 start = time (NULL);
408 while ((time (NULL) - start < 5) && (multi != NULL)) 413 while ((time (NULL) - start < 5) && (multi != NULL))
409 { 414 {
410 max = 0; 415 maxsock = MHD_INVALID_SOCKET;
416 maxposixs = -1;
411 FD_ZERO (&rs); 417 FD_ZERO (&rs);
412 FD_ZERO (&ws); 418 FD_ZERO (&ws);
413 FD_ZERO (&es); 419 FD_ZERO (&es);
414 curl_multi_perform (multi, &running); 420 curl_multi_perform (multi, &running);
415 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 421 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
416 if (mret != CURLM_OK) 422 if (mret != CURLM_OK)
417 { 423 {
418 curl_multi_remove_handle (multi, c); 424 curl_multi_remove_handle (multi, c);
@@ -422,7 +428,7 @@ testExternalPost ()
422 curl_formfree (pd); 428 curl_formfree (pd);
423 return 2048; 429 return 2048;
424 } 430 }
425 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 431 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
426 { 432 {
427 curl_multi_remove_handle (multi, c); 433 curl_multi_remove_handle (multi, c);
428 curl_multi_cleanup (multi); 434 curl_multi_cleanup (multi);
@@ -433,7 +439,7 @@ testExternalPost ()
433 } 439 }
434 tv.tv_sec = 0; 440 tv.tv_sec = 0;
435 tv.tv_usec = 1000; 441 tv.tv_usec = 1000;
436 select (max + 1, &rs, &ws, &es, &tv); 442 select (maxposixs + 1, &rs, &ws, &es, &tv);
437 curl_multi_perform (multi, &running); 443 curl_multi_perform (multi, &running);
438 if (running == 0) 444 if (running == 0)
439 { 445 {
diff --git a/src/testcurl/test_process_arguments.c b/src/testcurl/test_process_arguments.c
index 30863164..b5238043 100644
--- a/src/testcurl/test_process_arguments.c
+++ b/src/testcurl/test_process_arguments.c
@@ -120,7 +120,12 @@ testExternalGet ()
120 fd_set rs; 120 fd_set rs;
121 fd_set ws; 121 fd_set ws;
122 fd_set es; 122 fd_set es;
123 MHD_socket max; 123 MHD_socket maxsock;
124#ifdef MHD_WINSOCK_SOCKETS
125 int maxposixs; /* Max socket number unused on W32 */
126#else /* MHD_POSIX_SOCKETS */
127#define maxposixs maxsock
128#endif /* MHD_POSIX_SOCKETS */
124 int running; 129 int running;
125 struct CURLMsg *msg; 130 struct CURLMsg *msg;
126 time_t start; 131 time_t start;
@@ -170,12 +175,13 @@ testExternalGet ()
170 start = time (NULL); 175 start = time (NULL);
171 while ((time (NULL) - start < 5) && (multi != NULL)) 176 while ((time (NULL) - start < 5) && (multi != NULL))
172 { 177 {
173 max = 0; 178 maxsock = MHD_INVALID_SOCKET;
179 maxposixs = -1;
174 FD_ZERO (&rs); 180 FD_ZERO (&rs);
175 FD_ZERO (&ws); 181 FD_ZERO (&ws);
176 FD_ZERO (&es); 182 FD_ZERO (&es);
177 curl_multi_perform (multi, &running); 183 curl_multi_perform (multi, &running);
178 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 184 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
179 if (mret != CURLM_OK) 185 if (mret != CURLM_OK)
180 { 186 {
181 curl_multi_remove_handle (multi, c); 187 curl_multi_remove_handle (multi, c);
@@ -184,7 +190,7 @@ testExternalGet ()
184 MHD_stop_daemon (d); 190 MHD_stop_daemon (d);
185 return 2048; 191 return 2048;
186 } 192 }
187 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 193 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
188 { 194 {
189 curl_multi_remove_handle (multi, c); 195 curl_multi_remove_handle (multi, c);
190 curl_multi_cleanup (multi); 196 curl_multi_cleanup (multi);
@@ -194,7 +200,7 @@ testExternalGet ()
194 } 200 }
195 tv.tv_sec = 0; 201 tv.tv_sec = 0;
196 tv.tv_usec = 1000; 202 tv.tv_usec = 1000;
197 select (max + 1, &rs, &ws, &es, &tv); 203 select (maxposixs + 1, &rs, &ws, &es, &tv);
198 curl_multi_perform (multi, &running); 204 curl_multi_perform (multi, &running);
199 if (running == 0) 205 if (running == 0)
200 { 206 {
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 {
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 {
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c
index 3b60ef32..a20ea3c8 100644
--- a/src/testcurl/test_put_chunked.c
+++ b/src/testcurl/test_put_chunked.c
@@ -311,7 +311,12 @@ testExternalPut ()
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;
@@ -367,12 +372,13 @@ testExternalPut ()
367 start = time (NULL); 372 start = time (NULL);
368 while ((time (NULL) - start < 5) && (multi != NULL)) 373 while ((time (NULL) - start < 5) && (multi != NULL))
369 { 374 {
370 max = 0; 375 maxsock = MHD_INVALID_SOCKET;
376 maxposixs = -1;
371 FD_ZERO (&rs); 377 FD_ZERO (&rs);
372 FD_ZERO (&ws); 378 FD_ZERO (&ws);
373 FD_ZERO (&es); 379 FD_ZERO (&es);
374 curl_multi_perform (multi, &running); 380 curl_multi_perform (multi, &running);
375 mret = curl_multi_fdset (multi, &rs, &ws, &es, &max); 381 mret = curl_multi_fdset (multi, &rs, &ws, &es, &maxposixs);
376 if (mret != CURLM_OK) 382 if (mret != CURLM_OK)
377 { 383 {
378 curl_multi_remove_handle (multi, c); 384 curl_multi_remove_handle (multi, c);
@@ -381,7 +387,7 @@ testExternalPut ()
381 MHD_stop_daemon (d); 387 MHD_stop_daemon (d);
382 return 2048; 388 return 2048;
383 } 389 }
384 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max)) 390 if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxsock))
385 { 391 {
386 curl_multi_remove_handle (multi, c); 392 curl_multi_remove_handle (multi, c);
387 curl_multi_cleanup (multi); 393 curl_multi_cleanup (multi);
@@ -391,7 +397,7 @@ testExternalPut ()
391 } 397 }
392 tv.tv_sec = 0; 398 tv.tv_sec = 0;
393 tv.tv_usec = 1000; 399 tv.tv_usec = 1000;
394 select (max + 1, &rs, &ws, &es, &tv); 400 select (maxposixs + 1, &rs, &ws, &es, &tv);
395 curl_multi_perform (multi, &running); 401 curl_multi_perform (multi, &running);
396 if (running == 0) 402 if (running == 0)
397 { 403 {
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 {
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 02:00:14 +0000