diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-07 23:15:42 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-08 00:54:59 +0300 |
commit | a48ca85fb74479a8a81e137138a30fab58f3eb1e (patch) | |
tree | 9089a6392d1c21466259a46f7139c18644274e5a | |
parent | 4e4a1ce2bb9f6cd1d38fdc5f169d8956afab70c0 (diff) | |
download | libmicrohttpd-a48ca85fb74479a8a81e137138a30fab58f3eb1e.tar.gz libmicrohttpd-a48ca85fb74479a8a81e137138a30fab58f3eb1e.zip |
Renamed daemon flags:
MHD_USE_SELECT_INTERNALLY -> MHD_USE_INTERNAL_POLLING_THREAD
MHD_USE_POLL_INTERNALLY -> MHD_USE_POLL_INTERNAL_THREAD
MHD_USE_EPOLL_INTERNALLY -> MHD_USE_EPOLL_INTERNAL_THREAD
58 files changed, 148 insertions, 127 deletions
diff --git a/doc/chapters/hellobrowser.inc b/doc/chapters/hellobrowser.inc index bcd259b3..73b7b0b3 100644 --- a/doc/chapters/hellobrowser.inc +++ b/doc/chapters/hellobrowser.inc | |||
@@ -95,7 +95,7 @@ int main () | |||
95 | { | 95 | { |
96 | struct MHD_Daemon *daemon; | 96 | struct MHD_Daemon *daemon; |
97 | 97 | ||
98 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 98 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
99 | &answer_to_connection, NULL, MHD_OPTION_END); | 99 | &answer_to_connection, NULL, MHD_OPTION_END); |
100 | if (NULL == daemon) return 1; | 100 | if (NULL == daemon) return 1; |
101 | 101 | ||
diff --git a/doc/chapters/processingpost.inc b/doc/chapters/processingpost.inc index 92f93f55..920dac31 100644 --- a/doc/chapters/processingpost.inc +++ b/doc/chapters/processingpost.inc | |||
@@ -134,7 +134,7 @@ in the main function. | |||
134 | 134 | ||
135 | @verbatim | 135 | @verbatim |
136 | ... | 136 | ... |
137 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 137 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
138 | &answer_to_connection, NULL, | 138 | &answer_to_connection, NULL, |
139 | MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL, | 139 | MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL, |
140 | MHD_OPTION_END); | 140 | MHD_OPTION_END); |
diff --git a/doc/chapters/tlsauthentication.inc b/doc/chapters/tlsauthentication.inc index c1b66735..8bdfa764 100644 --- a/doc/chapters/tlsauthentication.inc +++ b/doc/chapters/tlsauthentication.inc | |||
@@ -68,7 +68,7 @@ main () | |||
68 | and then we point the @emph{MHD} daemon to it upon initalization. | 68 | and then we point the @emph{MHD} daemon to it upon initalization. |
69 | @verbatim | 69 | @verbatim |
70 | 70 | ||
71 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, | 71 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_SSL, |
72 | PORT, NULL, NULL, | 72 | PORT, NULL, NULL, |
73 | &answer_to_connection, NULL, | 73 | &answer_to_connection, NULL, |
74 | MHD_OPTION_HTTPS_MEM_KEY, key_pem, | 74 | MHD_OPTION_HTTPS_MEM_KEY, key_pem, |
@@ -138,7 +138,7 @@ To do this, you will need to link your application against @emph{gnutls}. | |||
138 | Next, when you start the MHD daemon, you must specify the root CA that you're | 138 | Next, when you start the MHD daemon, you must specify the root CA that you're |
139 | willing to trust: | 139 | willing to trust: |
140 | @verbatim | 140 | @verbatim |
141 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, | 141 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_SSL, |
142 | PORT, NULL, NULL, | 142 | PORT, NULL, NULL, |
143 | &answer_to_connection, NULL, | 143 | &answer_to_connection, NULL, |
144 | MHD_OPTION_HTTPS_MEM_KEY, key_pem, | 144 | MHD_OPTION_HTTPS_MEM_KEY, key_pem, |
@@ -326,7 +326,7 @@ of one domain is that you need to provide a callback instead of the key | |||
326 | and certificate. For example, when you start the MHD daemon, you could | 326 | and certificate. For example, when you start the MHD daemon, you could |
327 | do this: | 327 | do this: |
328 | @verbatim | 328 | @verbatim |
329 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL, | 329 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_SSL, |
330 | PORT, NULL, NULL, | 330 | PORT, NULL, NULL, |
331 | &answer_to_connection, NULL, | 331 | &answer_to_connection, NULL, |
332 | MHD_OPTION_HTTPS_CERT_CALLBACK, &sni_callback, | 332 | MHD_OPTION_HTTPS_CERT_CALLBACK, &sni_callback, |
diff --git a/doc/examples/basicauthentication.c b/doc/examples/basicauthentication.c index 407738be..22873d8c 100644 --- a/doc/examples/basicauthentication.c +++ b/doc/examples/basicauthentication.c | |||
@@ -71,7 +71,7 @@ main () | |||
71 | { | 71 | { |
72 | struct MHD_Daemon *daemon; | 72 | struct MHD_Daemon *daemon; |
73 | 73 | ||
74 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 74 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
75 | &answer_to_connection, NULL, MHD_OPTION_END); | 75 | &answer_to_connection, NULL, MHD_OPTION_END); |
76 | if (NULL == daemon) | 76 | if (NULL == daemon) |
77 | return 1; | 77 | return 1; |
diff --git a/doc/examples/hellobrowser.c b/doc/examples/hellobrowser.c index df38e72b..5031685c 100644 --- a/doc/examples/hellobrowser.c +++ b/doc/examples/hellobrowser.c | |||
@@ -39,7 +39,7 @@ main () | |||
39 | { | 39 | { |
40 | struct MHD_Daemon *daemon; | 40 | struct MHD_Daemon *daemon; |
41 | 41 | ||
42 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 42 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
43 | &answer_to_connection, NULL, MHD_OPTION_END); | 43 | &answer_to_connection, NULL, MHD_OPTION_END); |
44 | if (NULL == daemon) | 44 | if (NULL == daemon) |
45 | return 1; | 45 | return 1; |
diff --git a/doc/examples/largepost.c b/doc/examples/largepost.c index dc0e76c0..edaebd0d 100644 --- a/doc/examples/largepost.c +++ b/doc/examples/largepost.c | |||
@@ -282,7 +282,7 @@ main () | |||
282 | { | 282 | { |
283 | struct MHD_Daemon *daemon; | 283 | struct MHD_Daemon *daemon; |
284 | 284 | ||
285 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, | 285 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, |
286 | PORT, NULL, NULL, | 286 | PORT, NULL, NULL, |
287 | &answer_to_connection, NULL, | 287 | &answer_to_connection, NULL, |
288 | MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL, | 288 | MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL, |
diff --git a/doc/examples/logging.c b/doc/examples/logging.c index c896a7dd..aff21426 100644 --- a/doc/examples/logging.c +++ b/doc/examples/logging.c | |||
@@ -43,7 +43,7 @@ main () | |||
43 | { | 43 | { |
44 | struct MHD_Daemon *daemon; | 44 | struct MHD_Daemon *daemon; |
45 | 45 | ||
46 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 46 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
47 | &answer_to_connection, NULL, MHD_OPTION_END); | 47 | &answer_to_connection, NULL, MHD_OPTION_END); |
48 | if (NULL == daemon) | 48 | if (NULL == daemon) |
49 | return 1; | 49 | return 1; |
diff --git a/doc/examples/responseheaders.c b/doc/examples/responseheaders.c index 1ab89e0f..aa5cd7e2 100644 --- a/doc/examples/responseheaders.c +++ b/doc/examples/responseheaders.c | |||
@@ -73,7 +73,7 @@ main () | |||
73 | { | 73 | { |
74 | struct MHD_Daemon *daemon; | 74 | struct MHD_Daemon *daemon; |
75 | 75 | ||
76 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 76 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
77 | &answer_to_connection, NULL, MHD_OPTION_END); | 77 | &answer_to_connection, NULL, MHD_OPTION_END); |
78 | if (NULL == daemon) | 78 | if (NULL == daemon) |
79 | return 1; | 79 | return 1; |
diff --git a/doc/examples/simplepost.c b/doc/examples/simplepost.c index d167151f..b0b458c7 100644 --- a/doc/examples/simplepost.c +++ b/doc/examples/simplepost.c | |||
@@ -183,7 +183,7 @@ main () | |||
183 | { | 183 | { |
184 | struct MHD_Daemon *daemon; | 184 | struct MHD_Daemon *daemon; |
185 | 185 | ||
186 | daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL, | 186 | daemon = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD, PORT, NULL, NULL, |
187 | &answer_to_connection, NULL, | 187 | &answer_to_connection, NULL, |
188 | MHD_OPTION_NOTIFY_COMPLETED, request_completed, | 188 | MHD_OPTION_NOTIFY_COMPLETED, request_completed, |
189 | NULL, MHD_OPTION_END); | 189 | NULL, MHD_OPTION_END); |
diff --git a/doc/examples/tlsauthentication.c b/doc/examples/tlsauthentication.c index 41478136..742837e9 100644 --- a/doc/examples/tlsauthentication.c +++ b/doc/examples/tlsauthentication.c | |||
@@ -254,7 +254,7 @@ main () | |||
254 | } | 254 | } |
255 | 255 | ||
256 | daemon = | 256 | daemon = |
257 | MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS, PORT, NULL, | 257 | MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS, PORT, NULL, |
258 | NULL, &answer_to_connection, NULL, | 258 | NULL, &answer_to_connection, NULL, |
259 | MHD_OPTION_HTTPS_MEM_KEY, key_pem, | 259 | MHD_OPTION_HTTPS_MEM_KEY, key_pem, |
260 | MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END); | 260 | MHD_OPTION_HTTPS_MEM_CERT, cert_pem, MHD_OPTION_END); |
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi index 82bf9b23..182c1dd9 100644 --- a/doc/libmicrohttpd.texi +++ b/doc/libmicrohttpd.texi | |||
@@ -436,14 +436,14 @@ compiler). | |||
436 | Options for the MHD daemon. | 436 | Options for the MHD daemon. |
437 | 437 | ||
438 | Note that if neither @code{MHD_USE_THREAD_PER_CONNECTION} nor | 438 | Note that if neither @code{MHD_USE_THREAD_PER_CONNECTION} nor |
439 | @code{MHD_USE_SELECT_INTERNALLY} is used, the client wants control over | 439 | @code{MHD_USE_INTERNAL_POLLING_THREAD} is used, the client wants control over |
440 | the process and will call the appropriate microhttpd callbacks. | 440 | the process and will call the appropriate microhttpd callbacks. |
441 | 441 | ||
442 | Starting the daemon may also fail if a particular option is not | 442 | Starting the daemon may also fail if a particular option is not |
443 | implemented or not supported on the target platform (i.e. no support for | 443 | implemented or not supported on the target platform (i.e. no support for |
444 | @acronym{SSL}, threads or IPv6). SSL support generally depends on | 444 | @acronym{SSL}, threads or IPv6). SSL support generally depends on |
445 | options given during MHD compilation. Threaded operations | 445 | options given during MHD compilation. Threaded operations |
446 | (including @code{MHD_USE_SELECT_INTERNALLY}) are not supported on | 446 | (including @code{MHD_USE_INTERNAL_POLLING_THREAD}) are not supported on |
447 | Symbian. | 447 | Symbian. |
448 | 448 | ||
449 | @table @code | 449 | @table @code |
@@ -468,7 +468,7 @@ NULL. | |||
468 | @item MHD_USE_THREAD_PER_CONNECTION | 468 | @item MHD_USE_THREAD_PER_CONNECTION |
469 | Run using one thread per connection. | 469 | Run using one thread per connection. |
470 | 470 | ||
471 | @item MHD_USE_SELECT_INTERNALLY | 471 | @item MHD_USE_INTERNAL_POLLING_THREAD |
472 | Run using an internal thread doing @code{SELECT}. | 472 | Run using an internal thread doing @code{SELECT}. |
473 | 473 | ||
474 | @item MHD_USE_IPv6 | 474 | @item MHD_USE_IPv6 |
@@ -890,7 +890,7 @@ with the "--disable-messages" flag. | |||
890 | Number (unsigned int) of threads in thread pool. Enable | 890 | Number (unsigned int) of threads in thread pool. Enable |
891 | thread pooling by setting this value to to something | 891 | thread pooling by setting this value to to something |
892 | greater than 1. Currently, thread model must be | 892 | greater than 1. Currently, thread model must be |
893 | MHD_USE_SELECT_INTERNALLY if thread pooling is enabled | 893 | MHD_USE_INTERNAL_POLLING_THREAD if thread pooling is enabled |
894 | (@code{MHD_start_daemon} returns @code{NULL} for an unsupported thread | 894 | (@code{MHD_start_daemon} returns @code{NULL} for an unsupported thread |
895 | model). | 895 | model). |
896 | 896 | ||
@@ -2663,7 +2663,7 @@ Request the file-descriptor number that MHD is using for epoll. If | |||
2663 | the build is not supporting epoll, NULL is returned; if we are using a | 2663 | the build is not supporting epoll, NULL is returned; if we are using a |
2664 | thread pool or this daemon was not started with | 2664 | thread pool or this daemon was not started with |
2665 | @code{MHD_USE_EPOLL}, (a pointer to) -1 is returned. If we are | 2665 | @code{MHD_USE_EPOLL}, (a pointer to) -1 is returned. If we are |
2666 | using @code{MHD_USE_SELECT_INTERNALLY} or are in 'external' select mode, the | 2666 | using @code{MHD_USE_INTERNAL_POLLING_THREAD} or are in 'external' select mode, the |
2667 | internal epoll FD is returned. This function must be used in external | 2667 | internal epoll FD is returned. This function must be used in external |
2668 | select mode with epoll to obtain the FD to call epoll on. No extra | 2668 | select mode with epoll to obtain the FD to call epoll on. No extra |
2669 | arguments should be passed. | 2669 | arguments should be passed. |
@@ -2891,7 +2891,7 @@ MHD_USE_POLL can be used. | |||
2891 | @item MHD_FEATURE_EPOLL | 2891 | @item MHD_FEATURE_EPOLL |
2892 | Get whether @code{epoll()} is supported. If supported then Flags | 2892 | Get whether @code{epoll()} is supported. If supported then Flags |
2893 | MHD_USE_EPOLL and | 2893 | MHD_USE_EPOLL and |
2894 | MHD_USE_EPOLL_INTERNALLY can be used. | 2894 | MHD_USE_EPOLL_INTERNAL_THREAD can be used. |
2895 | 2895 | ||
2896 | @item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET | 2896 | @item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET |
2897 | Get whether shutdown on listen socket to signal other | 2897 | Get whether shutdown on listen socket to signal other |
diff --git a/src/examples/benchmark.c b/src/examples/benchmark.c index 54ee0c9d..bd17b371 100644 --- a/src/examples/benchmark.c +++ b/src/examples/benchmark.c | |||
@@ -134,7 +134,7 @@ main (int argc, char *const *argv) | |||
134 | MHD_HTTP_HEADER_CONNECTION, | 134 | MHD_HTTP_HEADER_CONNECTION, |
135 | "close"); | 135 | "close"); |
136 | #endif | 136 | #endif |
137 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SUPPRESS_DATE_NO_CLOCK | 137 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_SUPPRESS_DATE_NO_CLOCK |
138 | #ifdef EPOLL_SUPPORT | 138 | #ifdef EPOLL_SUPPORT |
139 | | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO | 139 | | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO |
140 | #endif | 140 | #endif |
diff --git a/src/examples/benchmark_https.c b/src/examples/benchmark_https.c index d3825172..009944db 100644 --- a/src/examples/benchmark_https.c +++ b/src/examples/benchmark_https.c | |||
@@ -180,7 +180,7 @@ main (int argc, char *const *argv) | |||
180 | response = MHD_create_response_from_buffer (strlen (PAGE), | 180 | response = MHD_create_response_from_buffer (strlen (PAGE), |
181 | (void *) PAGE, | 181 | (void *) PAGE, |
182 | MHD_RESPMEM_PERSISTENT); | 182 | MHD_RESPMEM_PERSISTENT); |
183 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | 183 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
184 | #ifdef EPOLL_SUPPORT | 184 | #ifdef EPOLL_SUPPORT |
185 | | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO | 185 | | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO |
186 | #endif | 186 | #endif |
diff --git a/src/examples/chunked_example.c b/src/examples/chunked_example.c index 08bb82d5..c9baa5b4 100644 --- a/src/examples/chunked_example.c +++ b/src/examples/chunked_example.c | |||
@@ -78,8 +78,8 @@ main (int argc, char *const *argv) | |||
78 | printf ("%s PORT\n", argv[0]); | 78 | printf ("%s PORT\n", argv[0]); |
79 | return 1; | 79 | return 1; |
80 | } | 80 | } |
81 | d = MHD_start_daemon (// MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_POLL, | 81 | d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_POLL, |
82 | MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 82 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
83 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, | 83 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, |
84 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, | 84 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, |
85 | atoi (argv[1]), | 85 | atoi (argv[1]), |
diff --git a/src/examples/demo.c b/src/examples/demo.c index 400f31cd..ef2a1780 100644 --- a/src/examples/demo.c +++ b/src/examples/demo.c | |||
@@ -883,7 +883,7 @@ main (int argc, char *const *argv) | |||
883 | MHD_RESPMEM_PERSISTENT); | 883 | MHD_RESPMEM_PERSISTENT); |
884 | mark_as_html (internal_error_response); | 884 | mark_as_html (internal_error_response); |
885 | update_directory (); | 885 | update_directory (); |
886 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | 886 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
887 | #ifdef EPOLL_SUPPORT | 887 | #ifdef EPOLL_SUPPORT |
888 | | MHD_USE_EPOLL | 888 | | MHD_USE_EPOLL |
889 | #endif | 889 | #endif |
diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c index 78c4fdb8..ee8643c0 100644 --- a/src/examples/demo_https.c +++ b/src/examples/demo_https.c | |||
@@ -932,7 +932,7 @@ main (int argc, char *const *argv) | |||
932 | MHD_RESPMEM_PERSISTENT); | 932 | MHD_RESPMEM_PERSISTENT); |
933 | mark_as_html (internal_error_response); | 933 | mark_as_html (internal_error_response); |
934 | update_directory (); | 934 | update_directory (); |
935 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_TLS | 935 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_TLS |
936 | #ifdef EPOLL_SUPPORT | 936 | #ifdef EPOLL_SUPPORT |
937 | | MHD_USE_EPOLL | 937 | | MHD_USE_EPOLL |
938 | #endif | 938 | #endif |
diff --git a/src/examples/dual_stack_example.c b/src/examples/dual_stack_example.c index 12d50f45..04ca3ca1 100644 --- a/src/examples/dual_stack_example.c +++ b/src/examples/dual_stack_example.c | |||
@@ -68,7 +68,7 @@ main (int argc, char *const *argv) | |||
68 | printf ("%s PORT\n", argv[0]); | 68 | printf ("%s PORT\n", argv[0]); |
69 | return 1; | 69 | return 1; |
70 | } | 70 | } |
71 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_DUAL_STACK, | 71 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_DUAL_STACK, |
72 | atoi (argv[1]), | 72 | atoi (argv[1]), |
73 | NULL, NULL, &ahc_echo, PAGE, | 73 | NULL, NULL, &ahc_echo, PAGE, |
74 | MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, | 74 | MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, |
diff --git a/src/examples/minimal_example.c b/src/examples/minimal_example.c index 313651c7..a1138f20 100644 --- a/src/examples/minimal_example.c +++ b/src/examples/minimal_example.c | |||
@@ -67,8 +67,8 @@ main (int argc, char *const *argv) | |||
67 | printf ("%s PORT\n", argv[0]); | 67 | printf ("%s PORT\n", argv[0]); |
68 | return 1; | 68 | return 1; |
69 | } | 69 | } |
70 | d = MHD_start_daemon (// MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | MHD_USE_POLL, | 70 | d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_POLL, |
71 | MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 71 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
72 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, | 72 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, |
73 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, | 73 | // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, |
74 | atoi (argv[1]), | 74 | atoi (argv[1]), |
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c index a917b723..c03755f4 100644 --- a/src/examples/upgrade_example.c +++ b/src/examples/upgrade_example.c | |||
@@ -275,7 +275,7 @@ main (int argc, | |||
275 | printf ("%s PORT\n", argv[0]); | 275 | printf ("%s PORT\n", argv[0]); |
276 | return 1; | 276 | return 1; |
277 | } | 277 | } |
278 | d = MHD_start_daemon (MHD_ALLOW_UPGRADE | MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 278 | d = MHD_start_daemon (MHD_ALLOW_UPGRADE | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
279 | atoi (argv[1]), | 279 | atoi (argv[1]), |
280 | NULL, NULL, | 280 | NULL, NULL, |
281 | &ahc_echo, NULL, | 281 | &ahc_echo, NULL, |
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index f87b675a..6f4e76a2 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -517,7 +517,7 @@ struct MHD_PostProcessor; | |||
517 | * @brief Flags for the `struct MHD_Daemon`. | 517 | * @brief Flags for the `struct MHD_Daemon`. |
518 | * | 518 | * |
519 | * Note that if neither #MHD_USE_THREAD_PER_CONNECTION nor | 519 | * Note that if neither #MHD_USE_THREAD_PER_CONNECTION nor |
520 | * #MHD_USE_SELECT_INTERNALLY is used, the client wants control over | 520 | * #MHD_USE_INTERNAL_POLLING_THREAD is used, the client wants control over |
521 | * the process and will call the appropriate microhttpd callbacks. | 521 | * the process and will call the appropriate microhttpd callbacks. |
522 | * | 522 | * |
523 | * Starting the daemon may also fail if a particular option is not | 523 | * Starting the daemon may also fail if a particular option is not |
@@ -557,9 +557,16 @@ enum MHD_FLAG | |||
557 | MHD_USE_THREAD_PER_CONNECTION = 4, | 557 | MHD_USE_THREAD_PER_CONNECTION = 4, |
558 | 558 | ||
559 | /** | 559 | /** |
560 | * Run using an internal thread (or thread pool) doing `select()`. | 560 | * Run using an internal thread (or thread pool) for sockets sending |
561 | * and receiving and data processing. | ||
561 | */ | 562 | */ |
563 | MHD_USE_INTERNAL_POLLING_THREAD = 8, | ||
564 | |||
565 | /** @deprecated */ | ||
562 | MHD_USE_SELECT_INTERNALLY = 8, | 566 | MHD_USE_SELECT_INTERNALLY = 8, |
567 | #define MHD_USE_SELECT_INTERNALLY \ | ||
568 | _MHD_DEPR_IN_MACRO("Value MHD_USE_SELECT_INTERNALLY is deprecated, use MHD_USE_INTERNAL_POLLING_THREAD instead") \ | ||
569 | MHD_USE_INTERNAL_POLLING_THREAD | ||
563 | 570 | ||
564 | /** | 571 | /** |
565 | * Run using the IPv6 protocol (otherwise, MHD will just support | 572 | * Run using the IPv6 protocol (otherwise, MHD will just support |
@@ -584,16 +591,24 @@ enum MHD_FLAG | |||
584 | /** | 591 | /** |
585 | * Use `poll()` instead of `select()`. This allows sockets with `fd >= | 592 | * Use `poll()` instead of `select()`. This allows sockets with `fd >= |
586 | * FD_SETSIZE`. This option is not compatible with using an | 593 | * FD_SETSIZE`. This option is not compatible with using an |
587 | * 'external' `select()` mode (as there is no API to get the file | 594 | * 'external' polling mode (as there is no API to get the file |
588 | * descriptors for the external select from MHD) and must also not | 595 | * descriptors for the external poll() from MHD) and must also not |
589 | * be used in combination with #MHD_USE_EPOLL. | 596 | * be used in combination with #MHD_USE_EPOLL. |
597 | * @sa ::MHD_FEATURE_POLL, #MHD_USE_POLL_INTERNAL_THREAD | ||
590 | */ | 598 | */ |
591 | MHD_USE_POLL = 64, | 599 | MHD_USE_POLL = 64, |
592 | 600 | ||
593 | /** | 601 | /** |
594 | * Run using an internal thread (or thread pool) doing `poll()`. | 602 | * Run using an internal thread (or thread pool) doing `poll()`. |
603 | * @sa ::MHD_FEATURE_POLL, #MHD_USE_POLL, #MHD_USE_INTERNAL_POLLING_THREAD | ||
595 | */ | 604 | */ |
596 | MHD_USE_POLL_INTERNALLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL, | 605 | MHD_USE_POLL_INTERNAL_THREAD = MHD_USE_POLL | MHD_USE_INTERNAL_POLLING_THREAD, |
606 | |||
607 | /** @deprecated */ | ||
608 | MHD_USE_POLL_INTERNALLY = MHD_USE_POLL | MHD_USE_INTERNAL_POLLING_THREAD, | ||
609 | #define MHD_USE_POLL_INTERNALLY \ | ||
610 | _MHD_DEPR_IN_MACRO("Value MHD_USE_POLL_INTERNALLY is deprecated, use MHD_USE_POLL_INTERNAL_THREAD instead") \ | ||
611 | MHD_USE_POLL_INTERNAL_THREAD | ||
597 | 612 | ||
598 | /** | 613 | /** |
599 | * Suppress (automatically) adding the 'Date:' header to HTTP responses. | 614 | * Suppress (automatically) adding the 'Date:' header to HTTP responses. |
@@ -633,15 +648,21 @@ enum MHD_FLAG | |||
633 | 648 | ||
634 | /** | 649 | /** |
635 | * Run using an internal thread (or thread pool) doing `epoll()`. | 650 | * Run using an internal thread (or thread pool) doing `epoll()`. |
636 | * This option is only available on Linux; using the option on | 651 | * This option is only available on certain platforms; using the option on |
637 | * non-Linux systems will cause #MHD_start_daemon to fail. | 652 | * platform without `epoll` support will cause #MHD_start_daemon to fail. |
653 | * @sa ::MHD_FEATURE_EPOLL, #MHD_USE_EPOLL, #MHD_USE_INTERNAL_POLLING_THREAD | ||
638 | */ | 654 | */ |
639 | MHD_USE_EPOLL_INTERNALLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL, | 655 | MHD_USE_EPOLL_INTERNAL_THREAD = MHD_USE_EPOLL | MHD_USE_INTERNAL_POLLING_THREAD, |
640 | 656 | ||
641 | /** @deprecated */ | 657 | /** @deprecated */ |
658 | MHD_USE_EPOLL_INTERNALLY = MHD_USE_EPOLL | MHD_USE_INTERNAL_POLLING_THREAD, | ||
659 | #define MHD_USE_EPOLL_INTERNALLY \ | ||
660 | _MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_INTERNALLY is deprecated, use MHD_USE_EPOLL_INTERNAL_THREAD") \ | ||
661 | MHD_USE_EPOLL_INTERNAL_THREAD | ||
662 | /** @deprecated */ | ||
642 | #define MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY \ | 663 | #define MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY \ |
643 | _MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY is deprecated, use MHD_USE_EPOLL_INTERNALLY") \ | 664 | _MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY is deprecated, use MHD_USE_EPOLL_INTERNAL_THREAD") \ |
644 | MHD_USE_EPOLL_INTERNALLY | 665 | MHD_USE_EPOLL_INTERNAL_THREAD |
645 | 666 | ||
646 | /** | 667 | /** |
647 | * Use inter-thread communication channel. | 668 | * Use inter-thread communication channel. |
@@ -869,7 +890,7 @@ enum MHD_OPTION | |||
869 | * Number (`unsigned int`) of threads in thread pool. Enable | 890 | * Number (`unsigned int`) of threads in thread pool. Enable |
870 | * thread pooling by setting this value to to something | 891 | * thread pooling by setting this value to to something |
871 | * greater than 1. Currently, thread model must be | 892 | * greater than 1. Currently, thread model must be |
872 | * #MHD_USE_SELECT_INTERNALLY if thread pooling is enabled | 893 | * #MHD_USE_INTERNAL_POLLING_THREAD if thread pooling is enabled |
873 | * (#MHD_start_daemon returns NULL for an unsupported thread | 894 | * (#MHD_start_daemon returns NULL for an unsupported thread |
874 | * model). | 895 | * model). |
875 | */ | 896 | */ |
@@ -2795,7 +2816,7 @@ enum MHD_FEATURE | |||
2795 | /** | 2816 | /** |
2796 | * Get whether `epoll()` is supported. If supported then Flags | 2817 | * Get whether `epoll()` is supported. If supported then Flags |
2797 | * #MHD_USE_EPOLL and | 2818 | * #MHD_USE_EPOLL and |
2798 | * #MHD_USE_EPOLL_INTERNALLY can be used. | 2819 | * #MHD_USE_EPOLL_INTERNAL_THREAD can be used. |
2799 | */ | 2820 | */ |
2800 | MHD_FEATURE_EPOLL = 7, | 2821 | MHD_FEATURE_EPOLL = 7, |
2801 | 2822 | ||
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c index 4be4a258..f256cb8f 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -1411,7 +1411,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection) | |||
1411 | { | 1411 | { |
1412 | if ((MHD_YES != try_grow_read_buffer (connection)) && | 1412 | if ((MHD_YES != try_grow_read_buffer (connection)) && |
1413 | (0 != (connection->daemon->options & | 1413 | (0 != (connection->daemon->options & |
1414 | (MHD_USE_SELECT_INTERNALLY | | 1414 | (MHD_USE_INTERNAL_POLLING_THREAD | |
1415 | MHD_USE_THREAD_PER_CONNECTION)))) | 1415 | MHD_USE_THREAD_PER_CONNECTION)))) |
1416 | { | 1416 | { |
1417 | /* failed to grow the read buffer, and the | 1417 | /* failed to grow the read buffer, and the |
@@ -2009,7 +2009,7 @@ process_request_body (struct MHD_Connection *connection) | |||
2009 | the setup was incorrect, which may prevent us from | 2009 | the setup was incorrect, which may prevent us from |
2010 | handling the rest of the request */ | 2010 | handling the rest of the request */ |
2011 | if ( ( (0 != (connection->daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || | 2011 | if ( ( (0 != (connection->daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || |
2012 | (0 != (connection->daemon->options & MHD_USE_SELECT_INTERNALLY)) ) && | 2012 | (0 != (connection->daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) ) && |
2013 | (MHD_NO == connection->suspended) ) | 2013 | (MHD_NO == connection->suspended) ) |
2014 | MHD_DLOG (connection->daemon, | 2014 | MHD_DLOG (connection->daemon, |
2015 | _("WARNING: incomplete POST processing and connection not suspended will result in hung connection.\n")); | 2015 | _("WARNING: incomplete POST processing and connection not suspended will result in hung connection.\n")); |
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index d7691754..59973c86 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -2957,8 +2957,8 @@ MHD_run_from_select (struct MHD_Daemon *daemon, | |||
2957 | struct MHD_UpgradeResponseHandle *urh; | 2957 | struct MHD_UpgradeResponseHandle *urh; |
2958 | struct MHD_UpgradeResponseHandle *urhn; | 2958 | struct MHD_UpgradeResponseHandle *urhn; |
2959 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ | 2959 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ |
2960 | unsigned int mask = MHD_ALLOW_SUSPEND_RESUME | MHD_USE_EPOLL_INTERNALLY | | 2960 | unsigned int mask = MHD_ALLOW_SUSPEND_RESUME | MHD_USE_EPOLL_INTERNAL_THREAD | |
2961 | MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION; | 2961 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_POLL_INTERNAL_THREAD | MHD_USE_THREAD_PER_CONNECTION; |
2962 | 2962 | ||
2963 | /* Clear ITC to avoid spinning select */ | 2963 | /* Clear ITC to avoid spinning select */ |
2964 | /* Do it before any other processing so new signals | 2964 | /* Do it before any other processing so new signals |
@@ -3904,7 +3904,7 @@ MHD_run (struct MHD_Daemon *daemon) | |||
3904 | { | 3904 | { |
3905 | if ( (MHD_YES == daemon->shutdown) || | 3905 | if ( (MHD_YES == daemon->shutdown) || |
3906 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || | 3906 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || |
3907 | (0 != (daemon->options & MHD_USE_SELECT_INTERNALLY)) ) | 3907 | (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) ) |
3908 | return MHD_NO; | 3908 | return MHD_NO; |
3909 | if (0 != (daemon->options & MHD_USE_POLL)) | 3909 | if (0 != (daemon->options & MHD_USE_POLL)) |
3910 | { | 3910 | { |
@@ -4089,7 +4089,7 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon) | |||
4089 | if (MHD_INVALID_SOCKET == ret) | 4089 | if (MHD_INVALID_SOCKET == ret) |
4090 | return MHD_INVALID_SOCKET; | 4090 | return MHD_INVALID_SOCKET; |
4091 | if ( (MHD_ITC_IS_INVALID_(daemon->itc)) && | 4091 | if ( (MHD_ITC_IS_INVALID_(daemon->itc)) && |
4092 | (0 != (daemon->options & (MHD_USE_SELECT_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION))) ) | 4092 | (0 != (daemon->options & (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_THREAD_PER_CONNECTION))) ) |
4093 | { | 4093 | { |
4094 | #ifdef HAVE_MESSAGES | 4094 | #ifdef HAVE_MESSAGES |
4095 | MHD_DLOG (daemon, | 4095 | MHD_DLOG (daemon, |
@@ -4786,7 +4786,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4786 | #else | 4786 | #else |
4787 | use_itc = 1; /* yes, must use ITC to signal thread */ | 4787 | use_itc = 1; /* yes, must use ITC to signal thread */ |
4788 | #endif | 4788 | #endif |
4789 | if (0 == (flags & (MHD_USE_SELECT_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION))) | 4789 | if (0 == (flags & (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_THREAD_PER_CONNECTION))) |
4790 | use_itc = 0; /* useless if we are using 'external' select */ | 4790 | use_itc = 0; /* useless if we are using 'external' select */ |
4791 | if (use_itc) | 4791 | if (use_itc) |
4792 | { | 4792 | { |
@@ -4890,18 +4890,18 @@ MHD_start_daemon_va (unsigned int flags, | |||
4890 | #endif | 4890 | #endif |
4891 | 4891 | ||
4892 | /* Thread pooling currently works only with internal select thread model */ | 4892 | /* Thread pooling currently works only with internal select thread model */ |
4893 | if ( (0 == (flags & MHD_USE_SELECT_INTERNALLY)) && | 4893 | if ( (0 == (flags & MHD_USE_INTERNAL_POLLING_THREAD)) && |
4894 | (daemon->worker_pool_size > 0) ) | 4894 | (daemon->worker_pool_size > 0) ) |
4895 | { | 4895 | { |
4896 | #ifdef HAVE_MESSAGES | 4896 | #ifdef HAVE_MESSAGES |
4897 | MHD_DLOG (daemon, | 4897 | MHD_DLOG (daemon, |
4898 | _("MHD thread pooling only works with MHD_USE_SELECT_INTERNALLY\n")); | 4898 | _("MHD thread pooling only works with MHD_USE_INTERNAL_POLLING_THREAD\n")); |
4899 | #endif | 4899 | #endif |
4900 | goto free_and_fail; | 4900 | goto free_and_fail; |
4901 | } | 4901 | } |
4902 | 4902 | ||
4903 | #ifdef __SYMBIAN32__ | 4903 | #ifdef __SYMBIAN32__ |
4904 | if (0 != (flags & (MHD_USE_SELECT_INTERNALLY | MHD_USE_THREAD_PER_CONNECTION))) | 4904 | if (0 != (flags & (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_THREAD_PER_CONNECTION))) |
4905 | { | 4905 | { |
4906 | #ifdef HAVE_MESSAGES | 4906 | #ifdef HAVE_MESSAGES |
4907 | MHD_DLOG (daemon, | 4907 | MHD_DLOG (daemon, |
@@ -5234,7 +5234,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5234 | } | 5234 | } |
5235 | #endif /* HTTPS_SUPPORT */ | 5235 | #endif /* HTTPS_SUPPORT */ |
5236 | if ( ( (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) || | 5236 | if ( ( (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) || |
5237 | ( (0 != (flags & MHD_USE_SELECT_INTERNALLY)) && | 5237 | ( (0 != (flags & MHD_USE_INTERNAL_POLLING_THREAD)) && |
5238 | (0 == daemon->worker_pool_size)) ) && | 5238 | (0 == daemon->worker_pool_size)) ) && |
5239 | (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) && | 5239 | (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) && |
5240 | (! MHD_create_named_thread_ (&daemon->pid, | 5240 | (! MHD_create_named_thread_ (&daemon->pid, |
@@ -5282,7 +5282,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5282 | 5282 | ||
5283 | memcpy (d, daemon, sizeof (struct MHD_Daemon)); | 5283 | memcpy (d, daemon, sizeof (struct MHD_Daemon)); |
5284 | /* Adjust pooling params for worker daemons; note that memcpy() | 5284 | /* Adjust pooling params for worker daemons; note that memcpy() |
5285 | has already copied MHD_USE_SELECT_INTERNALLY thread model into | 5285 | has already copied MHD_USE_INTERNAL_POLLING_THREAD thread model into |
5286 | the worker threads. */ | 5286 | the worker threads. */ |
5287 | d->master = daemon; | 5287 | d->master = daemon; |
5288 | d->worker_pool_size = 0; | 5288 | d->worker_pool_size = 0; |
@@ -5365,7 +5365,7 @@ thread_failed: | |||
5365 | /* If no worker threads created, then shut down normally. Calling | 5365 | /* If no worker threads created, then shut down normally. Calling |
5366 | MHD_stop_daemon (as we do below) doesn't work here since it | 5366 | MHD_stop_daemon (as we do below) doesn't work here since it |
5367 | assumes a 0-sized thread pool means we had been in the default | 5367 | assumes a 0-sized thread pool means we had been in the default |
5368 | MHD_USE_SELECT_INTERNALLY mode. */ | 5368 | MHD_USE_INTERNAL_POLLING_THREAD mode. */ |
5369 | if (0 == i) | 5369 | if (0 == i) |
5370 | { | 5370 | { |
5371 | if (MHD_INVALID_SOCKET != socket_fd) | 5371 | if (MHD_INVALID_SOCKET != socket_fd) |
@@ -5619,7 +5619,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon) | |||
5619 | fd = daemon->socket_fd; | 5619 | fd = daemon->socket_fd; |
5620 | daemon->socket_fd = MHD_INVALID_SOCKET; | 5620 | daemon->socket_fd = MHD_INVALID_SOCKET; |
5621 | 5621 | ||
5622 | if ( (0 != (daemon->options & MHD_USE_SELECT_INTERNALLY)) || | 5622 | if ( (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || |
5623 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ) | 5623 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ) |
5624 | { | 5624 | { |
5625 | /* Separate thread(s) is used for select()/poll()/etc. */ | 5625 | /* Separate thread(s) is used for select()/poll()/etc. */ |
diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c index ca1f71bc..4692085e 100644 --- a/src/microhttpd/test_daemon.c +++ b/src/microhttpd/test_daemon.c | |||
@@ -75,7 +75,7 @@ testStartStop () | |||
75 | { | 75 | { |
76 | struct MHD_Daemon *d; | 76 | struct MHD_Daemon *d; |
77 | 77 | ||
78 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 78 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
79 | 1080, | 79 | 1080, |
80 | &apc_nothing, | 80 | &apc_nothing, |
81 | NULL, &ahc_nothing, NULL, MHD_OPTION_END); | 81 | NULL, &ahc_nothing, NULL, MHD_OPTION_END); |
@@ -124,7 +124,7 @@ static int | |||
124 | testThread () | 124 | testThread () |
125 | { | 125 | { |
126 | struct MHD_Daemon *d; | 126 | struct MHD_Daemon *d; |
127 | d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SELECT_INTERNALLY, | 127 | d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_INTERNAL_POLLING_THREAD, |
128 | 1082, | 128 | 1082, |
129 | &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); | 129 | &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); |
130 | 130 | ||
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 6ca9e7dc..b29ab72a 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c | |||
@@ -1064,7 +1064,7 @@ test_upgrade (int flags, | |||
1064 | &run_usock_client, | 1064 | &run_usock_client, |
1065 | &sock)) | 1065 | &sock)) |
1066 | abort (); | 1066 | abort (); |
1067 | if (0 == (flags & (MHD_USE_SELECT_INTERNALLY | | 1067 | if (0 == (flags & (MHD_USE_INTERNAL_POLLING_THREAD | |
1068 | MHD_USE_THREAD_PER_CONNECTION)) ) | 1068 | MHD_USE_THREAD_PER_CONNECTION)) ) |
1069 | run_mhd_loop (d, flags); | 1069 | run_mhd_loop (d, flags); |
1070 | pthread_join (pt_client, | 1070 | pthread_join (pt_client, |
@@ -1176,14 +1176,14 @@ main (int argc, | |||
1176 | #endif /* HAVE_POLL */ | 1176 | #endif /* HAVE_POLL */ |
1177 | 1177 | ||
1178 | /* Test different event loops, with and without thread pool */ | 1178 | /* Test different event loops, with and without thread pool */ |
1179 | res = test_upgrade (MHD_USE_SELECT_INTERNALLY, | 1179 | res = test_upgrade (MHD_USE_INTERNAL_POLLING_THREAD, |
1180 | 0); | 1180 | 0); |
1181 | error_count += res; | 1181 | error_count += res; |
1182 | if (res) | 1182 | if (res) |
1183 | fprintf (stderr, "FAILED: Upgrade with internal select, return code %d.\n", res); | 1183 | fprintf (stderr, "FAILED: Upgrade with internal select, return code %d.\n", res); |
1184 | else if (verbose) | 1184 | else if (verbose) |
1185 | printf ("PASSED: Upgrade with internal select.\n"); | 1185 | printf ("PASSED: Upgrade with internal select.\n"); |
1186 | res = test_upgrade (MHD_USE_SELECT_INTERNALLY, | 1186 | res = test_upgrade (MHD_USE_INTERNAL_POLLING_THREAD, |
1187 | 2); | 1187 | 2); |
1188 | error_count += res; | 1188 | error_count += res; |
1189 | if (res) | 1189 | if (res) |
@@ -1191,14 +1191,14 @@ main (int argc, | |||
1191 | else if (verbose) | 1191 | else if (verbose) |
1192 | printf ("PASSED: Upgrade with internal select with thread pool.\n"); | 1192 | printf ("PASSED: Upgrade with internal select with thread pool.\n"); |
1193 | #ifdef HAVE_POLL | 1193 | #ifdef HAVE_POLL |
1194 | res = test_upgrade (MHD_USE_POLL_INTERNALLY, | 1194 | res = test_upgrade (MHD_USE_POLL_INTERNAL_THREAD, |
1195 | 0); | 1195 | 0); |
1196 | error_count += res; | 1196 | error_count += res; |
1197 | if (res) | 1197 | if (res) |
1198 | fprintf (stderr, "FAILED: Upgrade with internal poll, return code %d.\n", res); | 1198 | fprintf (stderr, "FAILED: Upgrade with internal poll, return code %d.\n", res); |
1199 | else if (verbose) | 1199 | else if (verbose) |
1200 | printf ("PASSED: Upgrade with internal poll.\n"); | 1200 | printf ("PASSED: Upgrade with internal poll.\n"); |
1201 | res = test_upgrade (MHD_USE_POLL_INTERNALLY, | 1201 | res = test_upgrade (MHD_USE_POLL_INTERNAL_THREAD, |
1202 | 2); | 1202 | 2); |
1203 | if (res) | 1203 | if (res) |
1204 | fprintf (stderr, "FAILED: Upgrade with internal poll with thread pool, return code %d.\n", res); | 1204 | fprintf (stderr, "FAILED: Upgrade with internal poll with thread pool, return code %d.\n", res); |
@@ -1206,13 +1206,13 @@ main (int argc, | |||
1206 | printf ("PASSED: Upgrade with internal poll with thread pool.\n"); | 1206 | printf ("PASSED: Upgrade with internal poll with thread pool.\n"); |
1207 | #endif | 1207 | #endif |
1208 | #ifdef EPOLL_SUPPORT | 1208 | #ifdef EPOLL_SUPPORT |
1209 | res = test_upgrade (MHD_USE_EPOLL_INTERNALLY, | 1209 | res = test_upgrade (MHD_USE_EPOLL_INTERNAL_THREAD, |
1210 | 0); | 1210 | 0); |
1211 | if (res) | 1211 | if (res) |
1212 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); | 1212 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); |
1213 | else if (verbose) | 1213 | else if (verbose) |
1214 | printf ("PASSED: Upgrade with internal epoll.\n"); | 1214 | printf ("PASSED: Upgrade with internal epoll.\n"); |
1215 | res = test_upgrade (MHD_USE_EPOLL_INTERNALLY, | 1215 | res = test_upgrade (MHD_USE_EPOLL_INTERNAL_THREAD, |
1216 | 2); | 1216 | 2); |
1217 | if (res) | 1217 | if (res) |
1218 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); | 1218 | fprintf (stderr, "FAILED: Upgrade with internal epoll, return code %d.\n", res); |
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c index f65dff26..dbc05640 100644 --- a/src/testcurl/https/test_empty_response.c +++ b/src/testcurl/https/test_empty_response.c | |||
@@ -80,7 +80,7 @@ testInternalSelectGet () | |||
80 | cbc.buf = buf; | 80 | cbc.buf = buf; |
81 | cbc.size = 2048; | 81 | cbc.size = 2048; |
82 | cbc.pos = 0; | 82 | cbc.pos = 0; |
83 | d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_SELECT_INTERNALLY, | 83 | d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_INTERNAL_POLLING_THREAD, |
84 | 1082, NULL, NULL, &ahc_echo, "GET", | 84 | 1082, NULL, NULL, &ahc_echo, "GET", |
85 | MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, | 85 | MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, |
86 | MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, | 86 | MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, |
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c index 5654cf5e..4b33e010 100644 --- a/src/testcurl/https/test_https_get_parallel.c +++ b/src/testcurl/https/test_https_get_parallel.c | |||
@@ -151,7 +151,7 @@ main (int argc, char *const *argv) | |||
151 | errorCount += | 151 | errorCount += |
152 | test_wrap ("single threaded daemon, single client, epoll", &test_single_client, | 152 | test_wrap ("single threaded daemon, single client, epoll", &test_single_client, |
153 | NULL, | 153 | NULL, |
154 | MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL, | 154 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL, |
155 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 155 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
156 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 156 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
157 | srv_self_signed_cert_pem, MHD_OPTION_END); | 157 | srv_self_signed_cert_pem, MHD_OPTION_END); |
@@ -159,7 +159,7 @@ main (int argc, char *const *argv) | |||
159 | errorCount += | 159 | errorCount += |
160 | test_wrap ("single threaded daemon, single client", &test_single_client, | 160 | test_wrap ("single threaded daemon, single client", &test_single_client, |
161 | NULL, | 161 | NULL, |
162 | MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG, | 162 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG, |
163 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 163 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
164 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 164 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
165 | srv_self_signed_cert_pem, MHD_OPTION_END); | 165 | srv_self_signed_cert_pem, MHD_OPTION_END); |
@@ -167,7 +167,7 @@ main (int argc, char *const *argv) | |||
167 | errorCount += | 167 | errorCount += |
168 | test_wrap ("single threaded daemon, parallel clients, epoll", | 168 | test_wrap ("single threaded daemon, parallel clients, epoll", |
169 | &test_parallel_clients, NULL, | 169 | &test_parallel_clients, NULL, |
170 | MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL, | 170 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL, |
171 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 171 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
172 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 172 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
173 | srv_self_signed_cert_pem, MHD_OPTION_END); | 173 | srv_self_signed_cert_pem, MHD_OPTION_END); |
@@ -175,7 +175,7 @@ main (int argc, char *const *argv) | |||
175 | errorCount += | 175 | errorCount += |
176 | test_wrap ("single threaded daemon, parallel clients", | 176 | test_wrap ("single threaded daemon, parallel clients", |
177 | &test_parallel_clients, NULL, | 177 | &test_parallel_clients, NULL, |
178 | MHD_USE_SELECT_INTERNALLY | MHD_USE_TLS | MHD_USE_DEBUG, | 178 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG, |
179 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, | 179 | aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, |
180 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, | 180 | srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, |
181 | srv_self_signed_cert_pem, MHD_OPTION_END); | 181 | srv_self_signed_cert_pem, MHD_OPTION_END); |
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c index 33783553..c374fe60 100644 --- a/src/testcurl/perf_get.c +++ b/src/testcurl/perf_get.c | |||
@@ -192,7 +192,7 @@ testInternalGet (int port, int poll_flag) | |||
192 | 192 | ||
193 | cbc.buf = buf; | 193 | cbc.buf = buf; |
194 | cbc.size = 2048; | 194 | cbc.size = 2048; |
195 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 195 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
196 | port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 196 | port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
197 | if (d == NULL) | 197 | if (d == NULL) |
198 | return 1; | 198 | return 1; |
@@ -311,7 +311,7 @@ testMultithreadedPoolGet (int port, int poll_flag) | |||
311 | 311 | ||
312 | cbc.buf = buf; | 312 | cbc.buf = buf; |
313 | cbc.size = 2048; | 313 | cbc.size = 2048; |
314 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 314 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
315 | port, NULL, NULL, &ahc_echo, "GET", | 315 | port, NULL, NULL, &ahc_echo, "GET", |
316 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 316 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
317 | if (d == NULL) | 317 | if (d == NULL) |
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c index 95ec3fa1..e2579fa6 100644 --- a/src/testcurl/perf_get_concurrent.c +++ b/src/testcurl/perf_get_concurrent.c | |||
@@ -236,7 +236,7 @@ testInternalGet (int port, int poll_flag) | |||
236 | const char * const test_desc = poll_flag ? "internal poll" : "internal select"; | 236 | const char * const test_desc = poll_flag ? "internal poll" : "internal select"; |
237 | const char * ret_val; | 237 | const char * ret_val; |
238 | 238 | ||
239 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 239 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
240 | port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 240 | port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
241 | if (d == NULL) | 241 | if (d == NULL) |
242 | return 1; | 242 | return 1; |
@@ -287,7 +287,7 @@ testMultithreadedPoolGet (int port, int poll_flag) | |||
287 | const char * const test_desc = poll_flag ? "thread pool with poll" : "thread pool with select"; | 287 | const char * const test_desc = poll_flag ? "thread pool with poll" : "thread pool with select"; |
288 | const char * ret_val; | 288 | const char * ret_val; |
289 | 289 | ||
290 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 290 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
291 | port, NULL, NULL, &ahc_echo, "GET", | 291 | port, NULL, NULL, &ahc_echo, "GET", |
292 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 292 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
293 | if (d == NULL) | 293 | if (d == NULL) |
diff --git a/src/testcurl/test_concurrent_stop.c b/src/testcurl/test_concurrent_stop.c index 8fd0c215..88aefddb 100644 --- a/src/testcurl/test_concurrent_stop.c +++ b/src/testcurl/test_concurrent_stop.c | |||
@@ -232,7 +232,7 @@ testMultithreadedPoolGet (int port, | |||
232 | struct MHD_Daemon *d; | 232 | struct MHD_Daemon *d; |
233 | pthread_t p; | 233 | pthread_t p; |
234 | 234 | ||
235 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 235 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
236 | port, | 236 | port, |
237 | NULL, NULL, | 237 | NULL, NULL, |
238 | &ahc_echo, "GET", | 238 | &ahc_echo, "GET", |
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c index 5630733e..431008cc 100644 --- a/src/testcurl/test_delete.c +++ b/src/testcurl/test_delete.c | |||
@@ -131,7 +131,7 @@ testInternalDelete () | |||
131 | cbc.buf = buf; | 131 | cbc.buf = buf; |
132 | cbc.size = 2048; | 132 | cbc.size = 2048; |
133 | cbc.pos = 0; | 133 | cbc.pos = 0; |
134 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 134 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
135 | 1080, | 135 | 1080, |
136 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 136 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); |
137 | if (d == NULL) | 137 | if (d == NULL) |
@@ -247,7 +247,7 @@ testMultithreadedPoolDelete () | |||
247 | cbc.buf = buf; | 247 | cbc.buf = buf; |
248 | cbc.size = 2048; | 248 | cbc.size = 2048; |
249 | cbc.pos = 0; | 249 | cbc.pos = 0; |
250 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 250 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
251 | 1081, | 251 | 1081, |
252 | NULL, NULL, &ahc_echo, &done_flag, | 252 | NULL, NULL, &ahc_echo, &done_flag, |
253 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 253 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c index b111e941..72670842 100644 --- a/src/testcurl/test_digestauth.c +++ b/src/testcurl/test_digestauth.c | |||
@@ -189,7 +189,7 @@ testDigestAuth () | |||
189 | return 1; | 189 | return 1; |
190 | } | 190 | } |
191 | #endif | 191 | #endif |
192 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 192 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
193 | 1337, NULL, NULL, &ahc_echo, PAGE, | 193 | 1337, NULL, NULL, &ahc_echo, PAGE, |
194 | MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, | 194 | MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, |
195 | MHD_OPTION_NONCE_NC_SIZE, 300, | 195 | MHD_OPTION_NONCE_NC_SIZE, 300, |
diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c index cdaf9e4c..c0c24747 100644 --- a/src/testcurl/test_digestauth_with_arguments.c +++ b/src/testcurl/test_digestauth_with_arguments.c | |||
@@ -184,7 +184,7 @@ testDigestAuth () | |||
184 | return 1; | 184 | return 1; |
185 | } | 185 | } |
186 | #endif | 186 | #endif |
187 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 187 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
188 | 1337, NULL, NULL, &ahc_echo, PAGE, | 188 | 1337, NULL, NULL, &ahc_echo, PAGE, |
189 | MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, | 189 | MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd, |
190 | MHD_OPTION_NONCE_NC_SIZE, 300, | 190 | MHD_OPTION_NONCE_NC_SIZE, 300, |
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index 95286023..b010aad7 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -120,7 +120,7 @@ testInternalGet (int poll_flag) | |||
120 | cbc.buf = buf; | 120 | cbc.buf = buf; |
121 | cbc.size = 2048; | 121 | cbc.size = 2048; |
122 | cbc.pos = 0; | 122 | cbc.pos = 0; |
123 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 123 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
124 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 124 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
125 | if (d == NULL) | 125 | if (d == NULL) |
126 | return 1; | 126 | return 1; |
@@ -220,7 +220,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
220 | cbc.buf = buf; | 220 | cbc.buf = buf; |
221 | cbc.size = 2048; | 221 | cbc.size = 2048; |
222 | cbc.pos = 0; | 222 | cbc.pos = 0; |
223 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 223 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
224 | 1081, NULL, NULL, &ahc_echo, "GET", | 224 | 1081, NULL, NULL, &ahc_echo, "GET", |
225 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 225 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
226 | if (d == NULL) | 226 | if (d == NULL) |
@@ -412,7 +412,7 @@ testUnknownPortGet (int poll_flag) | |||
412 | cbc.buf = buf; | 412 | cbc.buf = buf; |
413 | cbc.size = 2048; | 413 | cbc.size = 2048; |
414 | cbc.pos = 0; | 414 | cbc.pos = 0; |
415 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 415 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
416 | 1, NULL, NULL, &ahc_echo, "GET", | 416 | 1, NULL, NULL, &ahc_echo, "GET", |
417 | MHD_OPTION_SOCK_ADDR, &addr, | 417 | MHD_OPTION_SOCK_ADDR, &addr, |
418 | MHD_OPTION_END); | 418 | MHD_OPTION_END); |
@@ -571,7 +571,7 @@ testEmptyGet (int poll_flag) | |||
571 | cbc.buf = buf; | 571 | cbc.buf = buf; |
572 | cbc.size = 2048; | 572 | cbc.size = 2048; |
573 | cbc.pos = 0; | 573 | cbc.pos = 0; |
574 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 574 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
575 | 11081, NULL, NULL, &ahc_empty, NULL, MHD_OPTION_END); | 575 | 11081, NULL, NULL, &ahc_empty, NULL, MHD_OPTION_END); |
576 | if (d == NULL) | 576 | if (d == NULL) |
577 | return 4194304; | 577 | return 4194304; |
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c index 297d9061..b98b2e04 100644 --- a/src/testcurl/test_get_chunked.c +++ b/src/testcurl/test_get_chunked.c | |||
@@ -164,7 +164,7 @@ testInternalGet () | |||
164 | cbc.buf = buf; | 164 | cbc.buf = buf; |
165 | cbc.size = 2048; | 165 | cbc.size = 2048; |
166 | cbc.pos = 0; | 166 | cbc.pos = 0; |
167 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 167 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
168 | 1080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 168 | 1080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
169 | if (d == NULL) | 169 | if (d == NULL) |
170 | return 1; | 170 | return 1; |
@@ -248,7 +248,7 @@ testMultithreadedPoolGet () | |||
248 | cbc.buf = buf; | 248 | cbc.buf = buf; |
249 | cbc.size = 2048; | 249 | cbc.size = 2048; |
250 | cbc.pos = 0; | 250 | cbc.pos = 0; |
251 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 251 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
252 | 1081, NULL, NULL, &ahc_echo, "GET", | 252 | 1081, NULL, NULL, &ahc_echo, "GET", |
253 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 253 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
254 | if (d == NULL) | 254 | if (d == NULL) |
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c index 56b9b99e..85454d43 100644 --- a/src/testcurl/test_get_response_cleanup.c +++ b/src/testcurl/test_get_response_cleanup.c | |||
@@ -150,7 +150,7 @@ testInternalGet () | |||
150 | pid_t curl; | 150 | pid_t curl; |
151 | 151 | ||
152 | ok = 1; | 152 | ok = 1; |
153 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 153 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
154 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 154 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
155 | if (d == NULL) | 155 | if (d == NULL) |
156 | return 1; | 156 | return 1; |
@@ -207,7 +207,7 @@ testMultithreadedPoolGet () | |||
207 | struct MHD_Daemon *d; | 207 | struct MHD_Daemon *d; |
208 | pid_t curl; | 208 | pid_t curl; |
209 | 209 | ||
210 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 210 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
211 | 1081, NULL, NULL, &ahc_echo, "GET", | 211 | 1081, NULL, NULL, &ahc_echo, "GET", |
212 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 212 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
213 | if (d == NULL) | 213 | if (d == NULL) |
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c index ed4d3466..2b135013 100644 --- a/src/testcurl/test_get_sendfile.c +++ b/src/testcurl/test_get_sendfile.c | |||
@@ -125,7 +125,7 @@ testInternalGet () | |||
125 | cbc.buf = buf; | 125 | cbc.buf = buf; |
126 | cbc.size = 2048; | 126 | cbc.size = 2048; |
127 | cbc.pos = 0; | 127 | cbc.pos = 0; |
128 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 128 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
129 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 129 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
130 | if (d == NULL) | 130 | if (d == NULL) |
131 | return 1; | 131 | return 1; |
@@ -225,7 +225,7 @@ testMultithreadedPoolGet () | |||
225 | cbc.buf = buf; | 225 | cbc.buf = buf; |
226 | cbc.size = 2048; | 226 | cbc.size = 2048; |
227 | cbc.pos = 0; | 227 | cbc.pos = 0; |
228 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 228 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
229 | 1081, NULL, NULL, &ahc_echo, "GET", | 229 | 1081, NULL, NULL, &ahc_echo, "GET", |
230 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 230 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
231 | if (d == NULL) | 231 | if (d == NULL) |
@@ -417,7 +417,7 @@ testUnknownPortGet () | |||
417 | cbc.buf = buf; | 417 | cbc.buf = buf; |
418 | cbc.size = 2048; | 418 | cbc.size = 2048; |
419 | cbc.pos = 0; | 419 | cbc.pos = 0; |
420 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 420 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
421 | 1, NULL, NULL, &ahc_echo, "GET", | 421 | 1, NULL, NULL, &ahc_echo, "GET", |
422 | MHD_OPTION_SOCK_ADDR, &addr, | 422 | MHD_OPTION_SOCK_ADDR, &addr, |
423 | MHD_OPTION_END); | 423 | MHD_OPTION_END); |
diff --git a/src/testcurl/test_iplimit.c b/src/testcurl/test_iplimit.c index 0e1adbce..48536487 100644 --- a/src/testcurl/test_iplimit.c +++ b/src/testcurl/test_iplimit.c | |||
@@ -117,7 +117,7 @@ testMultithreadedGet () | |||
117 | if (!oneone) | 117 | if (!oneone) |
118 | return 0; | 118 | return 0; |
119 | 119 | ||
120 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 120 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
121 | 1081, NULL, NULL, | 121 | 1081, NULL, NULL, |
122 | &ahc_echo, "GET", | 122 | &ahc_echo, "GET", |
123 | MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2, | 123 | MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2, |
@@ -208,7 +208,7 @@ testMultithreadedPoolGet () | |||
208 | if (!oneone) | 208 | if (!oneone) |
209 | return 0; | 209 | return 0; |
210 | 210 | ||
211 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 211 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
212 | 1081, NULL, NULL, &ahc_echo, "GET", | 212 | 1081, NULL, NULL, &ahc_echo, "GET", |
213 | MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2, | 213 | MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2, |
214 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, | 214 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, |
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c index 8b088be9..65308a71 100644 --- a/src/testcurl/test_large_put.c +++ b/src/testcurl/test_large_put.c | |||
@@ -152,7 +152,7 @@ testInternalPut () | |||
152 | cbc.buf = buf; | 152 | cbc.buf = buf; |
153 | cbc.size = 2048; | 153 | cbc.size = 2048; |
154 | cbc.pos = 0; | 154 | cbc.pos = 0; |
155 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 155 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
156 | 1080, | 156 | 1080, |
157 | NULL, NULL, &ahc_echo, &done_flag, | 157 | NULL, NULL, &ahc_echo, &done_flag, |
158 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (1024*1024), | 158 | MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (1024*1024), |
@@ -271,7 +271,7 @@ testMultithreadedPoolPut () | |||
271 | cbc.buf = buf; | 271 | cbc.buf = buf; |
272 | cbc.size = 2048; | 272 | cbc.size = 2048; |
273 | cbc.pos = 0; | 273 | cbc.pos = 0; |
274 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 274 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
275 | 1081, | 275 | 1081, |
276 | NULL, NULL, &ahc_echo, &done_flag, | 276 | NULL, NULL, &ahc_echo, &done_flag, |
277 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, | 277 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, |
diff --git a/src/testcurl/test_long_header.c b/src/testcurl/test_long_header.c index 0819a439..c26791d0 100644 --- a/src/testcurl/test_long_header.c +++ b/src/testcurl/test_long_header.c | |||
@@ -101,7 +101,7 @@ testLongUrlGet () | |||
101 | cbc.buf = buf; | 101 | cbc.buf = buf; |
102 | cbc.size = 2048; | 102 | cbc.size = 2048; |
103 | cbc.pos = 0; | 103 | cbc.pos = 0; |
104 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 104 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
105 | 1080, | 105 | 1080, |
106 | &apc_all, | 106 | &apc_all, |
107 | NULL, | 107 | NULL, |
@@ -172,7 +172,7 @@ testLongHeaderGet () | |||
172 | cbc.buf = buf; | 172 | cbc.buf = buf; |
173 | cbc.size = 2048; | 173 | cbc.size = 2048; |
174 | cbc.pos = 0; | 174 | cbc.pos = 0; |
175 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 175 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
176 | 1080, | 176 | 1080, |
177 | &apc_all, | 177 | &apc_all, |
178 | NULL, | 178 | NULL, |
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c index 18ad0499..e251b879 100644 --- a/src/testcurl/test_post.c +++ b/src/testcurl/test_post.c | |||
@@ -170,7 +170,7 @@ testInternalPost () | |||
170 | cbc.buf = buf; | 170 | cbc.buf = buf; |
171 | cbc.size = 2048; | 171 | cbc.size = 2048; |
172 | cbc.pos = 0; | 172 | cbc.pos = 0; |
173 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 173 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
174 | 1080, NULL, NULL, &ahc_echo, NULL, | 174 | 1080, NULL, NULL, &ahc_echo, NULL, |
175 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 175 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
176 | MHD_OPTION_END); | 176 | MHD_OPTION_END); |
@@ -278,7 +278,7 @@ testMultithreadedPoolPost () | |||
278 | cbc.buf = buf; | 278 | cbc.buf = buf; |
279 | cbc.size = 2048; | 279 | cbc.size = 2048; |
280 | cbc.pos = 0; | 280 | cbc.pos = 0; |
281 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 281 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
282 | 1081, NULL, NULL, &ahc_echo, NULL, | 282 | 1081, NULL, NULL, &ahc_echo, NULL, |
283 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, | 283 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, |
284 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 284 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c index 0dad0153..43775390 100644 --- a/src/testcurl/test_post_loop.c +++ b/src/testcurl/test_post_loop.c | |||
@@ -119,7 +119,7 @@ testInternalPost () | |||
119 | 119 | ||
120 | cbc.buf = buf; | 120 | cbc.buf = buf; |
121 | cbc.size = 2048; | 121 | cbc.size = 2048; |
122 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 122 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
123 | 1080, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); | 123 | 1080, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); |
124 | if (d == NULL) | 124 | if (d == NULL) |
125 | return 1; | 125 | return 1; |
@@ -247,7 +247,7 @@ testMultithreadedPoolPost () | |||
247 | 247 | ||
248 | cbc.buf = buf; | 248 | cbc.buf = buf; |
249 | cbc.size = 2048; | 249 | cbc.size = 2048; |
250 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 250 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
251 | 1081, NULL, NULL, &ahc_echo, NULL, | 251 | 1081, NULL, NULL, &ahc_echo, NULL, |
252 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 252 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
253 | if (d == NULL) | 253 | if (d == NULL) |
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c index 41d294f4..9c1381d1 100644 --- a/src/testcurl/test_postform.c +++ b/src/testcurl/test_postform.c | |||
@@ -183,7 +183,7 @@ testInternalPost () | |||
183 | cbc.buf = buf; | 183 | cbc.buf = buf; |
184 | cbc.size = 2048; | 184 | cbc.size = 2048; |
185 | cbc.pos = 0; | 185 | cbc.pos = 0; |
186 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 186 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
187 | 1080, NULL, NULL, &ahc_echo, NULL, | 187 | 1080, NULL, NULL, &ahc_echo, NULL, |
188 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 188 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
189 | MHD_OPTION_END); | 189 | MHD_OPTION_END); |
@@ -295,7 +295,7 @@ testMultithreadedPoolPost () | |||
295 | cbc.buf = buf; | 295 | cbc.buf = buf; |
296 | cbc.size = 2048; | 296 | cbc.size = 2048; |
297 | cbc.pos = 0; | 297 | cbc.pos = 0; |
298 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 298 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
299 | 1081, NULL, NULL, &ahc_echo, NULL, | 299 | 1081, NULL, NULL, &ahc_echo, NULL, |
300 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, | 300 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, |
301 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 301 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c index 43f3a17e..b87a139f 100644 --- a/src/testcurl/test_process_headers.c +++ b/src/testcurl/test_process_headers.c | |||
@@ -157,7 +157,7 @@ testInternalGet () | |||
157 | cbc.buf = buf; | 157 | cbc.buf = buf; |
158 | cbc.size = 2048; | 158 | cbc.size = 2048; |
159 | cbc.pos = 0; | 159 | cbc.pos = 0; |
160 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 160 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
161 | 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 161 | 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
162 | if (d == NULL) | 162 | if (d == NULL) |
163 | return 1; | 163 | return 1; |
@@ -255,7 +255,7 @@ testMultithreadedPoolGet () | |||
255 | cbc.buf = buf; | 255 | cbc.buf = buf; |
256 | cbc.size = 2048; | 256 | cbc.size = 2048; |
257 | cbc.pos = 0; | 257 | cbc.pos = 0; |
258 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 258 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
259 | 21080, NULL, NULL, &ahc_echo, "GET", | 259 | 21080, NULL, NULL, &ahc_echo, "GET", |
260 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 260 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
261 | if (d == NULL) | 261 | if (d == NULL) |
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c index f6636f12..19fcd07e 100644 --- a/src/testcurl/test_put.c +++ b/src/testcurl/test_put.c | |||
@@ -131,7 +131,7 @@ testInternalPut () | |||
131 | cbc.buf = buf; | 131 | cbc.buf = buf; |
132 | cbc.size = 2048; | 132 | cbc.size = 2048; |
133 | cbc.pos = 0; | 133 | cbc.pos = 0; |
134 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 134 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
135 | 1080, | 135 | 1080, |
136 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 136 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); |
137 | if (d == NULL) | 137 | if (d == NULL) |
@@ -244,7 +244,7 @@ testMultithreadedPoolPut () | |||
244 | cbc.buf = buf; | 244 | cbc.buf = buf; |
245 | cbc.size = 2048; | 245 | cbc.size = 2048; |
246 | cbc.pos = 0; | 246 | cbc.pos = 0; |
247 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 247 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
248 | 1081, | 248 | 1081, |
249 | NULL, NULL, &ahc_echo, &done_flag, | 249 | NULL, NULL, &ahc_echo, &done_flag, |
250 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 250 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c index c0105afa..25cfb5b4 100644 --- a/src/testcurl/test_put_chunked.c +++ b/src/testcurl/test_put_chunked.c | |||
@@ -141,7 +141,7 @@ testInternalPut () | |||
141 | cbc.buf = buf; | 141 | cbc.buf = buf; |
142 | cbc.size = 2048; | 142 | cbc.size = 2048; |
143 | cbc.pos = 0; | 143 | cbc.pos = 0; |
144 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 144 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
145 | 11080, | 145 | 11080, |
146 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 146 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); |
147 | if (d == NULL) | 147 | if (d == NULL) |
@@ -254,7 +254,7 @@ testMultithreadedPoolPut () | |||
254 | cbc.buf = buf; | 254 | cbc.buf = buf; |
255 | cbc.size = 2048; | 255 | cbc.size = 2048; |
256 | cbc.pos = 0; | 256 | cbc.pos = 0; |
257 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 257 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
258 | 11081, | 258 | 11081, |
259 | NULL, NULL, &ahc_echo, &done_flag, | 259 | NULL, NULL, &ahc_echo, &done_flag, |
260 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 260 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c index 429ecf48..10577f26 100644 --- a/src/testcurl/test_quiesce.c +++ b/src/testcurl/test_quiesce.c | |||
@@ -487,20 +487,20 @@ main (int argc, char *const *argv) | |||
487 | 487 | ||
488 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) | 488 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) |
489 | return 2; | 489 | return 2; |
490 | errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0, 0); | 490 | errorCount += testGet (MHD_USE_INTERNAL_POLLING_THREAD, 0, 0); |
491 | errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, 0); | 491 | errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, 0); |
492 | errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, 0); | 492 | errorCount += testGet (MHD_USE_INTERNAL_POLLING_THREAD, CPU_COUNT, 0); |
493 | errorCount += testExternalGet (); | 493 | errorCount += testExternalGet (); |
494 | if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL)) | 494 | if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL)) |
495 | { | 495 | { |
496 | errorCount += testGet(MHD_USE_SELECT_INTERNALLY, 0, MHD_USE_POLL); | 496 | errorCount += testGet(MHD_USE_INTERNAL_POLLING_THREAD, 0, MHD_USE_POLL); |
497 | errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, MHD_USE_POLL); | 497 | errorCount += testGet (MHD_USE_THREAD_PER_CONNECTION, 0, MHD_USE_POLL); |
498 | errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, MHD_USE_POLL); | 498 | errorCount += testGet (MHD_USE_INTERNAL_POLLING_THREAD, CPU_COUNT, MHD_USE_POLL); |
499 | } | 499 | } |
500 | if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL)) | 500 | if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL)) |
501 | { | 501 | { |
502 | errorCount += testGet (MHD_USE_SELECT_INTERNALLY, 0, MHD_USE_EPOLL); | 502 | errorCount += testGet (MHD_USE_INTERNAL_POLLING_THREAD, 0, MHD_USE_EPOLL); |
503 | errorCount += testGet (MHD_USE_SELECT_INTERNALLY, CPU_COUNT, MHD_USE_EPOLL); | 503 | errorCount += testGet (MHD_USE_INTERNAL_POLLING_THREAD, CPU_COUNT, MHD_USE_EPOLL); |
504 | } | 504 | } |
505 | if (errorCount != 0) | 505 | if (errorCount != 0) |
506 | fprintf (stderr, "Error (code: %u)\n", errorCount); | 506 | fprintf (stderr, "Error (code: %u)\n", errorCount); |
diff --git a/src/testcurl/test_quiesce_stream.c b/src/testcurl/test_quiesce_stream.c index 112f5ad1..bee95486 100644 --- a/src/testcurl/test_quiesce_stream.c +++ b/src/testcurl/test_quiesce_stream.c | |||
@@ -168,7 +168,7 @@ main() | |||
168 | 168 | ||
169 | /* Flags */ | 169 | /* Flags */ |
170 | unsigned int daemon_flags | 170 | unsigned int daemon_flags |
171 | = MHD_USE_SELECT_INTERNALLY | 171 | = MHD_USE_INTERNAL_POLLING_THREAD |
172 | | MHD_USE_EPOLL | 172 | | MHD_USE_EPOLL |
173 | | MHD_ALLOW_SUSPEND_RESUME | 173 | | MHD_ALLOW_SUSPEND_RESUME |
174 | | MHD_USE_ITC; | 174 | | MHD_USE_ITC; |
diff --git a/src/testcurl/test_start_stop.c b/src/testcurl/test_start_stop.c index 66d19f0e..2e5c22c0 100644 --- a/src/testcurl/test_start_stop.c +++ b/src/testcurl/test_start_stop.c | |||
@@ -54,7 +54,7 @@ testInternalGet (int poll_flag) | |||
54 | { | 54 | { |
55 | struct MHD_Daemon *d; | 55 | struct MHD_Daemon *d; |
56 | 56 | ||
57 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 57 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
58 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 58 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
59 | if (d == NULL) | 59 | if (d == NULL) |
60 | return 1; | 60 | return 1; |
@@ -80,7 +80,7 @@ testMultithreadedPoolGet (int poll_flag) | |||
80 | { | 80 | { |
81 | struct MHD_Daemon *d; | 81 | struct MHD_Daemon *d; |
82 | 82 | ||
83 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 83 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
84 | 1081, NULL, NULL, &ahc_echo, "GET", | 84 | 1081, NULL, NULL, &ahc_echo, "GET", |
85 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); | 85 | MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT, MHD_OPTION_END); |
86 | if (d == NULL) | 86 | if (d == NULL) |
diff --git a/src/testcurl/test_timeout.c b/src/testcurl/test_timeout.c index 11e4a9b9..3d7379d0 100644 --- a/src/testcurl/test_timeout.c +++ b/src/testcurl/test_timeout.c | |||
@@ -172,7 +172,7 @@ testWithoutTimeout () | |||
172 | cbc.buf = buf; | 172 | cbc.buf = buf; |
173 | cbc.size = 2048; | 173 | cbc.size = 2048; |
174 | cbc.pos = 0; | 174 | cbc.pos = 0; |
175 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 175 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
176 | 1080, | 176 | 1080, |
177 | NULL, NULL, &ahc_echo, &done_flag, | 177 | NULL, NULL, &ahc_echo, &done_flag, |
178 | MHD_OPTION_CONNECTION_TIMEOUT, 2, | 178 | MHD_OPTION_CONNECTION_TIMEOUT, 2, |
@@ -227,7 +227,7 @@ testWithTimeout () | |||
227 | cbc.buf = buf; | 227 | cbc.buf = buf; |
228 | cbc.size = 2048; | 228 | cbc.size = 2048; |
229 | cbc.pos = 0; | 229 | cbc.pos = 0; |
230 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 230 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
231 | 1080, | 231 | 1080, |
232 | NULL, NULL, &ahc_echo, &done_flag, | 232 | NULL, NULL, &ahc_echo, &done_flag, |
233 | MHD_OPTION_CONNECTION_TIMEOUT, 2, | 233 | MHD_OPTION_CONNECTION_TIMEOUT, 2, |
diff --git a/src/testcurl/test_urlparse.c b/src/testcurl/test_urlparse.c index cc00b4db..ca74addc 100644 --- a/src/testcurl/test_urlparse.c +++ b/src/testcurl/test_urlparse.c | |||
@@ -134,7 +134,7 @@ testInternalGet (int poll_flag) | |||
134 | cbc.buf = buf; | 134 | cbc.buf = buf; |
135 | cbc.size = 2048; | 135 | cbc.size = 2048; |
136 | cbc.pos = 0; | 136 | cbc.pos = 0; |
137 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG | poll_flag, | 137 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, |
138 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 138 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
139 | if (d == NULL) | 139 | if (d == NULL) |
140 | return 1; | 140 | return 1; |
diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c index 2c0c1a13..62468b2c 100644 --- a/src/testzzuf/test_get.c +++ b/src/testzzuf/test_get.c | |||
@@ -104,7 +104,7 @@ testInternalGet () | |||
104 | cbc.buf = buf; | 104 | cbc.buf = buf; |
105 | cbc.size = 2048; | 105 | cbc.size = 2048; |
106 | cbc.pos = 0; | 106 | cbc.pos = 0; |
107 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 107 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
108 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 108 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
109 | if (d == NULL) | 109 | if (d == NULL) |
110 | return 1; | 110 | return 1; |
diff --git a/src/testzzuf/test_get_chunked.c b/src/testzzuf/test_get_chunked.c index 843bc507..4524f2c4 100644 --- a/src/testzzuf/test_get_chunked.c +++ b/src/testzzuf/test_get_chunked.c | |||
@@ -130,7 +130,7 @@ testInternalGet () | |||
130 | cbc.buf = buf; | 130 | cbc.buf = buf; |
131 | cbc.size = 2048; | 131 | cbc.size = 2048; |
132 | cbc.pos = 0; | 132 | cbc.pos = 0; |
133 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 133 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
134 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); | 134 | 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); |
135 | if (d == NULL) | 135 | if (d == NULL) |
136 | return 1; | 136 | return 1; |
diff --git a/src/testzzuf/test_long_header.c b/src/testzzuf/test_long_header.c index 59125295..f1b05756 100644 --- a/src/testzzuf/test_long_header.c +++ b/src/testzzuf/test_long_header.c | |||
@@ -103,7 +103,7 @@ testLongUrlGet () | |||
103 | cbc.buf = buf; | 103 | cbc.buf = buf; |
104 | cbc.size = 2048; | 104 | cbc.size = 2048; |
105 | cbc.pos = 0; | 105 | cbc.pos = 0; |
106 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 106 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
107 | 11080, | 107 | 11080, |
108 | &apc_all, | 108 | &apc_all, |
109 | NULL, | 109 | NULL, |
@@ -165,7 +165,7 @@ testLongHeaderGet () | |||
165 | cbc.buf = buf; | 165 | cbc.buf = buf; |
166 | cbc.size = 2048; | 166 | cbc.size = 2048; |
167 | cbc.pos = 0; | 167 | cbc.pos = 0; |
168 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 168 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
169 | 11080, | 169 | 11080, |
170 | &apc_all, | 170 | &apc_all, |
171 | NULL, | 171 | NULL, |
diff --git a/src/testzzuf/test_post.c b/src/testzzuf/test_post.c index 460f295f..f0dc9632 100644 --- a/src/testzzuf/test_post.c +++ b/src/testzzuf/test_post.c | |||
@@ -157,7 +157,7 @@ testInternalPost () | |||
157 | cbc.buf = buf; | 157 | cbc.buf = buf; |
158 | cbc.size = 2048; | 158 | cbc.size = 2048; |
159 | cbc.pos = 0; | 159 | cbc.pos = 0; |
160 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 160 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
161 | 11080, NULL, NULL, &ahc_echo, NULL, | 161 | 11080, NULL, NULL, &ahc_echo, NULL, |
162 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 162 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
163 | MHD_OPTION_END); | 163 | MHD_OPTION_END); |
diff --git a/src/testzzuf/test_post_form.c b/src/testzzuf/test_post_form.c index d110b2c0..3dee2515 100644 --- a/src/testzzuf/test_post_form.c +++ b/src/testzzuf/test_post_form.c | |||
@@ -176,7 +176,7 @@ testInternalPost () | |||
176 | cbc.buf = buf; | 176 | cbc.buf = buf; |
177 | cbc.size = 2048; | 177 | cbc.size = 2048; |
178 | cbc.pos = 0; | 178 | cbc.pos = 0; |
179 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 179 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
180 | 11080, NULL, NULL, &ahc_echo, NULL, | 180 | 11080, NULL, NULL, &ahc_echo, NULL, |
181 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, | 181 | MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, |
182 | MHD_OPTION_END); | 182 | MHD_OPTION_END); |
diff --git a/src/testzzuf/test_put.c b/src/testzzuf/test_put.c index 455c7424..6bda2598 100644 --- a/src/testzzuf/test_put.c +++ b/src/testzzuf/test_put.c | |||
@@ -128,7 +128,7 @@ testInternalPut () | |||
128 | cbc.buf = buf; | 128 | cbc.buf = buf; |
129 | cbc.size = 2048; | 129 | cbc.size = 2048; |
130 | cbc.pos = 0; | 130 | cbc.pos = 0; |
131 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 131 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
132 | 11080, | 132 | 11080, |
133 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 133 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); |
134 | if (d == NULL) | 134 | if (d == NULL) |
diff --git a/src/testzzuf/test_put_chunked.c b/src/testzzuf/test_put_chunked.c index 7dd0f066..ed0a0a65 100644 --- a/src/testzzuf/test_put_chunked.c +++ b/src/testzzuf/test_put_chunked.c | |||
@@ -134,7 +134,7 @@ testInternalPut () | |||
134 | cbc.buf = buf; | 134 | cbc.buf = buf; |
135 | cbc.size = 2048; | 135 | cbc.size = 2048; |
136 | cbc.pos = 0; | 136 | cbc.pos = 0; |
137 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, | 137 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, |
138 | 11080, | 138 | 11080, |
139 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 139 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); |
140 | if (d == NULL) | 140 | if (d == NULL) |
diff --git a/src/testzzuf/test_put_large.c b/src/testzzuf/test_put_large.c index 4dfea460..f6fd21d2 100644 --- a/src/testzzuf/test_put_large.c +++ b/src/testzzuf/test_put_large.c | |||
@@ -142,7 +142,7 @@ testInternalPut () | |||
142 | cbc.buf = buf; | 142 | cbc.buf = buf; |
143 | cbc.size = 2048; | 143 | cbc.size = 2048; |
144 | cbc.pos = 0; | 144 | cbc.pos = 0; |
145 | d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY /* | MHD_USE_DEBUG */ , | 145 | d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , |
146 | 11080, | 146 | 11080, |
147 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); | 147 | NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); |
148 | if (d == NULL) | 148 | if (d == NULL) |