diff options
Diffstat (limited to 'src/testcurl')
31 files changed, 95 insertions, 16 deletions
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c index 1f009660..0a8af562 100644 --- a/src/testcurl/perf_get.c +++ b/src/testcurl/perf_get.c | |||
@@ -461,6 +461,7 @@ testExternalGet (uint16_t port) | |||
461 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 461 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
462 | port, NULL, NULL, | 462 | port, NULL, NULL, |
463 | &ahc_echo, NULL, | 463 | &ahc_echo, NULL, |
464 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
464 | MHD_OPTION_END); | 465 | MHD_OPTION_END); |
465 | if (NULL == d) | 466 | if (NULL == d) |
466 | return 256; | 467 | return 256; |
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c index a0cf4c6a..f4728ff4 100644 --- a/src/testcurl/perf_get_concurrent.c +++ b/src/testcurl/perf_get_concurrent.c | |||
@@ -421,7 +421,9 @@ testExternalGet (uint16_t port) | |||
421 | 421 | ||
422 | signal_done = 0; | 422 | signal_done = 0; |
423 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 423 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
424 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 424 | port, NULL, NULL, &ahc_echo, NULL, |
425 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
426 | MHD_OPTION_END); | ||
425 | if (d == NULL) | 427 | if (d == NULL) |
426 | return 256; | 428 | return 256; |
427 | if (0 == port) | 429 | if (0 == port) |
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c index 5cc91a9b..4fd651b3 100644 --- a/src/testcurl/test_add_conn.c +++ b/src/testcurl/test_add_conn.c | |||
@@ -737,7 +737,18 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
737 | *pport += 4; | 737 | *pport += 4; |
738 | } | 738 | } |
739 | 739 | ||
740 | if (testMhdThreadInternalPool != thrType) | 740 | if (testMhdThreadExternal == thrType) |
741 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | ||
742 | | (thrType == testMhdThreadExternal ? | ||
743 | 0 : MHD_USE_ITC) | ||
744 | | (no_listen ? MHD_USE_NO_LISTEN_SOCKET : 0) | ||
745 | | MHD_USE_ERROR_LOG, | ||
746 | *pport, NULL, NULL, | ||
747 | &ahc_echo, NULL, | ||
748 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | ||
749 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
750 | MHD_OPTION_END); | ||
751 | else if (testMhdThreadInternalPool != thrType) | ||
741 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 752 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
742 | | (thrType == testMhdThreadExternal ? | 753 | | (thrType == testMhdThreadExternal ? |
743 | 0 : MHD_USE_ITC) | 754 | 0 : MHD_USE_ITC) |
diff --git a/src/testcurl/test_basicauth.c b/src/testcurl/test_basicauth.c index 732c1ec1..963639c9 100644 --- a/src/testcurl/test_basicauth.c +++ b/src/testcurl/test_basicauth.c | |||
@@ -650,6 +650,7 @@ testBasicAuth (void) | |||
650 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 650 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
651 | port, NULL, NULL, | 651 | port, NULL, NULL, |
652 | &ahc_echo, NULL, | 652 | &ahc_echo, NULL, |
653 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
653 | MHD_OPTION_END); | 654 | MHD_OPTION_END); |
654 | if (d == NULL) | 655 | if (d == NULL) |
655 | return 1; | 656 | return 1; |
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c index a64c6e2e..510043cc 100644 --- a/src/testcurl/test_callback.c +++ b/src/testcurl/test_callback.c | |||
@@ -147,6 +147,7 @@ main (int argc, char **argv) | |||
147 | NULL, | 147 | NULL, |
148 | &callback, | 148 | &callback, |
149 | NULL, | 149 | NULL, |
150 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
150 | MHD_OPTION_END); | 151 | MHD_OPTION_END); |
151 | if (d == NULL) | 152 | if (d == NULL) |
152 | return 32; | 153 | return 32; |
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c index adf68592..681afe30 100644 --- a/src/testcurl/test_delete.c +++ b/src/testcurl/test_delete.c | |||
@@ -391,7 +391,9 @@ testExternalDelete (void) | |||
391 | cbc.pos = 0; | 391 | cbc.pos = 0; |
392 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 392 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
393 | port, | 393 | port, |
394 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 394 | NULL, NULL, &ahc_echo, &done_flag, |
395 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
396 | MHD_OPTION_END); | ||
395 | if (d == NULL) | 397 | if (d == NULL) |
396 | return 256; | 398 | return 256; |
397 | if (0 == port) | 399 | if (0 == port) |
diff --git a/src/testcurl/test_digestauth2.c b/src/testcurl/test_digestauth2.c index 62a4d4a2..ce2def62 100644 --- a/src/testcurl/test_digestauth2.c +++ b/src/testcurl/test_digestauth2.c | |||
@@ -1374,6 +1374,7 @@ testDigestAuth (void) | |||
1374 | MHD_OPTION_NONCE_NC_SIZE, 300, | 1374 | MHD_OPTION_NONCE_NC_SIZE, 300, |
1375 | MHD_OPTION_DIGEST_AUTH_NONCE_BIND_TYPE, | 1375 | MHD_OPTION_DIGEST_AUTH_NONCE_BIND_TYPE, |
1376 | dauth_nonce_bind, | 1376 | dauth_nonce_bind, |
1377 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
1377 | MHD_OPTION_END); | 1378 | MHD_OPTION_END); |
1378 | } | 1379 | } |
1379 | if (d == NULL) | 1380 | if (d == NULL) |
diff --git a/src/testcurl/test_digestauth_emu_ext.c b/src/testcurl/test_digestauth_emu_ext.c index d5e79eb3..7a6e8e7b 100644 --- a/src/testcurl/test_digestauth_emu_ext.c +++ b/src/testcurl/test_digestauth_emu_ext.c | |||
@@ -823,6 +823,7 @@ testDigestAuthEmu (void) | |||
823 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 823 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
824 | port, NULL, NULL, | 824 | port, NULL, NULL, |
825 | &ahc_echo, NULL, | 825 | &ahc_echo, NULL, |
826 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
826 | MHD_OPTION_END); | 827 | MHD_OPTION_END); |
827 | if (d == NULL) | 828 | if (d == NULL) |
828 | return 1; | 829 | return 1; |
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index ad794ef7..b44c8370 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -428,6 +428,7 @@ testExternalGet (void) | |||
428 | global_port, NULL, NULL, | 428 | global_port, NULL, NULL, |
429 | &ahc_echo, NULL, | 429 | &ahc_echo, NULL, |
430 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 430 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
431 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
431 | MHD_OPTION_END); | 432 | MHD_OPTION_END); |
432 | if (d == NULL) | 433 | if (d == NULL) |
433 | return 256; | 434 | return 256; |
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c index ebba7110..1b985ce2 100644 --- a/src/testcurl/test_get_chunked.c +++ b/src/testcurl/test_get_chunked.c | |||
@@ -592,7 +592,9 @@ testExternalGet (void) | |||
592 | cbc.size = 2048; | 592 | cbc.size = 2048; |
593 | cbc.pos = 0; | 593 | cbc.pos = 0; |
594 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 594 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
595 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 595 | port, NULL, NULL, &ahc_echo, NULL, |
596 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
597 | MHD_OPTION_END); | ||
596 | if (d == NULL) | 598 | if (d == NULL) |
597 | return 256; | 599 | return 256; |
598 | if (0 == port) | 600 | if (0 == port) |
diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c index 21f909c6..5771bec9 100644 --- a/src/testcurl/test_get_close_keep_alive.c +++ b/src/testcurl/test_get_close_keep_alive.c | |||
@@ -956,7 +956,15 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
956 | *pport += 2; | 956 | *pport += 2; |
957 | } | 957 | } |
958 | 958 | ||
959 | if (testMhdThreadInternalPool != thrType) | 959 | if (testMhdThreadExternal == thrType) |
960 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | ||
961 | | MHD_USE_ERROR_LOG, | ||
962 | *pport, NULL, NULL, | ||
963 | &ahc_echo, NULL, | ||
964 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | ||
965 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
966 | MHD_OPTION_END); | ||
967 | else if (testMhdThreadInternalPool != thrType) | ||
960 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 968 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
961 | | MHD_USE_ERROR_LOG, | 969 | | MHD_USE_ERROR_LOG, |
962 | *pport, NULL, NULL, | 970 | *pport, NULL, NULL, |
diff --git a/src/testcurl/test_get_empty.c b/src/testcurl/test_get_empty.c index cc34d152..3ec28c3f 100644 --- a/src/testcurl/test_get_empty.c +++ b/src/testcurl/test_get_empty.c | |||
@@ -390,6 +390,7 @@ testExternalGet () | |||
390 | global_port, NULL, NULL, | 390 | global_port, NULL, NULL, |
391 | &ahc_echo, "GET", | 391 | &ahc_echo, "GET", |
392 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 392 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
393 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
393 | MHD_OPTION_END); | 394 | MHD_OPTION_END); |
394 | if (d == NULL) | 395 | if (d == NULL) |
395 | return 256; | 396 | return 256; |
diff --git a/src/testcurl/test_get_iovec.c b/src/testcurl/test_get_iovec.c index daaa7840..00e4fa3e 100644 --- a/src/testcurl/test_get_iovec.c +++ b/src/testcurl/test_get_iovec.c | |||
@@ -517,7 +517,9 @@ testExternalGet (void) | |||
517 | cbc.size = sizeof(readbuf); | 517 | cbc.size = sizeof(readbuf); |
518 | cbc.pos = 0; | 518 | cbc.pos = 0; |
519 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 519 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
520 | port, NULL, NULL, &ahc_cont, NULL, MHD_OPTION_END); | 520 | port, NULL, NULL, &ahc_cont, NULL, |
521 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
522 | MHD_OPTION_END); | ||
521 | if (d == NULL) | 523 | if (d == NULL) |
522 | return 256; | 524 | return 256; |
523 | if (0 == port) | 525 | if (0 == port) |
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c index 8307dc42..29cbc8bd 100644 --- a/src/testcurl/test_get_response_cleanup.c +++ b/src/testcurl/test_get_response_cleanup.c | |||
@@ -339,7 +339,9 @@ testExternalGet (void) | |||
339 | 339 | ||
340 | ok = 1; | 340 | ok = 1; |
341 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 341 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
342 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 342 | port, NULL, NULL, &ahc_echo, NULL, |
343 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
344 | MHD_OPTION_END); | ||
343 | if (d == NULL) | 345 | if (d == NULL) |
344 | return 256; | 346 | return 256; |
345 | if (0 == port) | 347 | if (0 == port) |
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c index 893d252b..698a7c2e 100644 --- a/src/testcurl/test_get_sendfile.c +++ b/src/testcurl/test_get_sendfile.c | |||
@@ -374,7 +374,9 @@ testExternalGet (void) | |||
374 | cbc.size = 2048; | 374 | cbc.size = 2048; |
375 | cbc.pos = 0; | 375 | cbc.pos = 0; |
376 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 376 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
377 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 377 | port, NULL, NULL, &ahc_echo, NULL, |
378 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
379 | MHD_OPTION_END); | ||
378 | if (d == NULL) | 380 | if (d == NULL) |
379 | return 256; | 381 | return 256; |
380 | if (0 == port) | 382 | if (0 == port) |
diff --git a/src/testcurl/test_head.c b/src/testcurl/test_head.c index f8e1fccc..4f820880 100644 --- a/src/testcurl/test_head.c +++ b/src/testcurl/test_head.c | |||
@@ -759,6 +759,7 @@ testHead (void) | |||
759 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 759 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
760 | port, NULL, NULL, | 760 | port, NULL, NULL, |
761 | &ahcCheck, &ahc_param, | 761 | &ahcCheck, &ahc_param, |
762 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
762 | MHD_OPTION_END); | 763 | MHD_OPTION_END); |
763 | if (d == NULL) | 764 | if (d == NULL) |
764 | return 1; | 765 | return 1; |
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c index e478056b..d2612fa8 100644 --- a/src/testcurl/test_large_put.c +++ b/src/testcurl/test_large_put.c | |||
@@ -652,6 +652,7 @@ testPutExternal (void) | |||
652 | NULL, NULL, &ahc_echo, &done_flag, | 652 | NULL, NULL, &ahc_echo, &done_flag, |
653 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, | 653 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, |
654 | (size_t) (incr_read ? 1024 : (PUT_SIZE * 4)), | 654 | (size_t) (incr_read ? 1024 : (PUT_SIZE * 4)), |
655 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
655 | MHD_OPTION_END); | 656 | MHD_OPTION_END); |
656 | if (d == NULL) | 657 | if (d == NULL) |
657 | mhdErrorExit (); | 658 | mhdErrorExit (); |
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c index b2f1d318..d81f0765 100644 --- a/src/testcurl/test_parse_cookies.c +++ b/src/testcurl/test_parse_cookies.c | |||
@@ -1651,6 +1651,7 @@ testExternalPolling (void) | |||
1651 | &ahcCheck, &ahc_param, | 1651 | &ahcCheck, &ahc_param, |
1652 | MHD_OPTION_CLIENT_DISCIPLINE_LVL, | 1652 | MHD_OPTION_CLIENT_DISCIPLINE_LVL, |
1653 | (int) (discp_level), | 1653 | (int) (discp_level), |
1654 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
1654 | MHD_OPTION_END); | 1655 | MHD_OPTION_END); |
1655 | if (d == NULL) | 1656 | if (d == NULL) |
1656 | return 1; | 1657 | return 1; |
diff --git a/src/testcurl/test_patch.c b/src/testcurl/test_patch.c index 95839f39..e5f37901 100644 --- a/src/testcurl/test_patch.c +++ b/src/testcurl/test_patch.c | |||
@@ -376,7 +376,9 @@ testExternalPut (void) | |||
376 | cbc.pos = 0; | 376 | cbc.pos = 0; |
377 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 377 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
378 | port, | 378 | port, |
379 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 379 | NULL, NULL, &ahc_echo, &done_flag, |
380 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
381 | MHD_OPTION_END); | ||
380 | if (d == NULL) | 382 | if (d == NULL) |
381 | return 256; | 383 | return 256; |
382 | if (0 == port) | 384 | if (0 == port) |
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c index 8dedcc17..3f64c0a4 100644 --- a/src/testcurl/test_post.c +++ b/src/testcurl/test_post.c | |||
@@ -436,6 +436,7 @@ testExternalPost (void) | |||
436 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 436 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
437 | port, NULL, NULL, &ahc_echo, NULL, | 437 | port, NULL, NULL, &ahc_echo, NULL, |
438 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 438 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
439 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
439 | MHD_OPTION_END); | 440 | MHD_OPTION_END); |
440 | if (d == NULL) | 441 | if (d == NULL) |
441 | return 256; | 442 | return 256; |
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c index 879d0266..7144abdd 100644 --- a/src/testcurl/test_post_loop.c +++ b/src/testcurl/test_post_loop.c | |||
@@ -432,7 +432,9 @@ testExternalPost (void) | |||
432 | cbc.size = 2048; | 432 | cbc.size = 2048; |
433 | cbc.pos = 0; | 433 | cbc.pos = 0; |
434 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 434 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
435 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 435 | port, NULL, NULL, &ahc_echo, NULL, |
436 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
437 | MHD_OPTION_END); | ||
436 | if (d == NULL) | 438 | if (d == NULL) |
437 | return 256; | 439 | return 256; |
438 | if (0 == port) | 440 | if (0 == port) |
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c index 7534b6b7..bbd0d137 100644 --- a/src/testcurl/test_postform.c +++ b/src/testcurl/test_postform.c | |||
@@ -560,6 +560,7 @@ testExternalPost (void) | |||
560 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 560 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
561 | port, NULL, NULL, &ahc_echo, NULL, | 561 | port, NULL, NULL, &ahc_echo, NULL, |
562 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 562 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
563 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
563 | MHD_OPTION_END); | 564 | MHD_OPTION_END); |
564 | if (d == NULL) | 565 | if (d == NULL) |
565 | return 256; | 566 | return 256; |
diff --git a/src/testcurl/test_process_arguments.c b/src/testcurl/test_process_arguments.c index 358b42f4..f9720b89 100644 --- a/src/testcurl/test_process_arguments.c +++ b/src/testcurl/test_process_arguments.c | |||
@@ -150,7 +150,9 @@ testExternalGet (void) | |||
150 | cbc.size = 2048; | 150 | cbc.size = 2048; |
151 | cbc.pos = 0; | 151 | cbc.pos = 0; |
152 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 152 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
153 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 153 | port, NULL, NULL, &ahc_echo, NULL, |
154 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
155 | MHD_OPTION_END); | ||
154 | if (d == NULL) | 156 | if (d == NULL) |
155 | return 256; | 157 | return 256; |
156 | if (0 == port) | 158 | if (0 == port) |
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c index 8a20d885..ce30b8a9 100644 --- a/src/testcurl/test_process_headers.c +++ b/src/testcurl/test_process_headers.c | |||
@@ -407,7 +407,9 @@ testExternalGet (void) | |||
407 | cbc.size = 2048; | 407 | cbc.size = 2048; |
408 | cbc.pos = 0; | 408 | cbc.pos = 0; |
409 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 409 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
410 | port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 410 | port, NULL, NULL, &ahc_echo, NULL, |
411 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
412 | MHD_OPTION_END); | ||
411 | if (d == NULL) | 413 | if (d == NULL) |
412 | return 256; | 414 | return 256; |
413 | if (0 == port) | 415 | if (0 == port) |
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c index 03881040..97ed8591 100644 --- a/src/testcurl/test_put.c +++ b/src/testcurl/test_put.c | |||
@@ -400,7 +400,9 @@ testExternalPut (void) | |||
400 | cbc.pos = 0; | 400 | cbc.pos = 0; |
401 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 401 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
402 | port, | 402 | port, |
403 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 403 | NULL, NULL, &ahc_echo, &done_flag, |
404 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
405 | MHD_OPTION_END); | ||
404 | if (d == NULL) | 406 | if (d == NULL) |
405 | return 256; | 407 | return 256; |
406 | if (0 == port) | 408 | if (0 == port) |
diff --git a/src/testcurl/test_put_broken_len.c b/src/testcurl/test_put_broken_len.c index f1090b92..65e8cd82 100644 --- a/src/testcurl/test_put_broken_len.c +++ b/src/testcurl/test_put_broken_len.c | |||
@@ -631,6 +631,7 @@ performTest (void) | |||
631 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 631 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
632 | port, NULL, NULL, | 632 | port, NULL, NULL, |
633 | &ahcCheck, &ahc_param, | 633 | &ahcCheck, &ahc_param, |
634 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
634 | MHD_OPTION_END); | 635 | MHD_OPTION_END); |
635 | if (d == NULL) | 636 | if (d == NULL) |
636 | return 1; | 637 | return 1; |
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c index 6d55aa27..403614ce 100644 --- a/src/testcurl/test_put_chunked.c +++ b/src/testcurl/test_put_chunked.c | |||
@@ -398,7 +398,9 @@ testExternalPut (void) | |||
398 | cbc.pos = 0; | 398 | cbc.pos = 0; |
399 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 399 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, |
400 | port, | 400 | port, |
401 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 401 | NULL, NULL, &ahc_echo, &done_flag, |
402 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
403 | MHD_OPTION_END); | ||
402 | if (d == NULL) | 404 | if (d == NULL) |
403 | return 256; | 405 | return 256; |
404 | if (0 == port) | 406 | if (0 == port) |
diff --git a/src/testcurl/test_put_header_fold.c b/src/testcurl/test_put_header_fold.c index c6a78b65..9b77ed99 100644 --- a/src/testcurl/test_put_header_fold.c +++ b/src/testcurl/test_put_header_fold.c | |||
@@ -1151,6 +1151,7 @@ performCheck (void) | |||
1151 | port, NULL, NULL, | 1151 | port, NULL, NULL, |
1152 | &ahcCheck, &ahc_param, | 1152 | &ahcCheck, &ahc_param, |
1153 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, mem_limit, | 1153 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, mem_limit, |
1154 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
1154 | MHD_OPTION_END); | 1155 | MHD_OPTION_END); |
1155 | } | 1156 | } |
1156 | if (d == NULL) | 1157 | if (d == NULL) |
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c index be7b43b7..f4b76e93 100644 --- a/src/testcurl/test_quiesce.c +++ b/src/testcurl/test_quiesce.c | |||
@@ -320,6 +320,7 @@ ServeOneRequest (void *param) | |||
320 | 0, NULL, NULL, &ahc_echo, NULL, | 320 | 0, NULL, NULL, &ahc_echo, NULL, |
321 | MHD_OPTION_LISTEN_SOCKET, fd, | 321 | MHD_OPTION_LISTEN_SOCKET, fd, |
322 | MHD_OPTION_NOTIFY_COMPLETED, &request_completed, &done, | 322 | MHD_OPTION_NOTIFY_COMPLETED, &request_completed, &done, |
323 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
323 | MHD_OPTION_END); | 324 | MHD_OPTION_END); |
324 | if (d == NULL) | 325 | if (d == NULL) |
325 | mhdErrorExit (); | 326 | mhdErrorExit (); |
@@ -558,6 +559,7 @@ testExternalGet (void) | |||
558 | global_port, | 559 | global_port, |
559 | NULL, NULL, | 560 | NULL, NULL, |
560 | &ahc_echo, NULL, | 561 | &ahc_echo, NULL, |
562 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
561 | MHD_OPTION_END); | 563 | MHD_OPTION_END); |
562 | if (d == NULL) | 564 | if (d == NULL) |
563 | mhdErrorExitDesc ("Failed to start MHD daemon"); | 565 | mhdErrorExitDesc ("Failed to start MHD daemon"); |
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c index 0fea130d..e5d519c3 100644 --- a/src/testcurl/test_toolarge.c +++ b/src/testcurl/test_toolarge.c | |||
@@ -1451,7 +1451,18 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
1451 | *pport += 16; | 1451 | *pport += 16; |
1452 | } | 1452 | } |
1453 | 1453 | ||
1454 | if (testMhdThreadInternalPool != thrType) | 1454 | if (testMhdThreadExternal == thrType) |
1455 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | ||
1456 | | (verbose ? MHD_USE_ERROR_LOG : 0), | ||
1457 | *pport, NULL, NULL, | ||
1458 | &ahcCheck, *ahc_param, | ||
1459 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, | ||
1460 | *uri_cb_param, | ||
1461 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, | ||
1462 | (size_t) BUFFER_SIZE, | ||
1463 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
1464 | MHD_OPTION_END); | ||
1465 | else if (testMhdThreadInternalPool != thrType) | ||
1455 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 1466 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
1456 | | (verbose ? MHD_USE_ERROR_LOG : 0), | 1467 | | (verbose ? MHD_USE_ERROR_LOG : 0), |
1457 | *pport, NULL, NULL, | 1468 | *pport, NULL, NULL, |
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c index 493b3d69..b3f52484 100644 --- a/src/testcurl/test_tricky.c +++ b/src/testcurl/test_tricky.c | |||
@@ -962,7 +962,16 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
962 | *pport += 16; | 962 | *pport += 16; |
963 | } | 963 | } |
964 | 964 | ||
965 | if (testMhdThreadInternalPool != thrType) | 965 | if (testMhdThreadExternal == thrType) |
966 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | ||
967 | | (verbose ? MHD_USE_ERROR_LOG : 0), | ||
968 | *pport, NULL, NULL, | ||
969 | &ahcCheck, *ahc_param, | ||
970 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, | ||
971 | *uri_cb_param, | ||
972 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | ||
973 | MHD_OPTION_END); | ||
974 | else if (testMhdThreadInternalPool != thrType) | ||
966 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 975 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
967 | | (verbose ? MHD_USE_ERROR_LOG : 0), | 976 | | (verbose ? MHD_USE_ERROR_LOG : 0), |
968 | *pport, NULL, NULL, | 977 | *pport, NULL, NULL, |