diff options
34 files changed, 100 insertions, 58 deletions
diff --git a/src/microhttpd/test_client_put_stop.c b/src/microhttpd/test_client_put_stop.c index 388bc12d..aaf5c829 100644 --- a/src/microhttpd/test_client_put_stop.c +++ b/src/microhttpd/test_client_put_stop.c | |||
@@ -1979,7 +1979,8 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
1979 | 1979 | ||
1980 | if (testMhdThreadExternal == thrType) | 1980 | if (testMhdThreadExternal == thrType) |
1981 | d = MHD_start_daemon (((unsigned int) pollType) | 1981 | d = MHD_start_daemon (((unsigned int) pollType) |
1982 | | (verbose ? MHD_USE_ERROR_LOG : 0), | 1982 | | (verbose ? MHD_USE_ERROR_LOG : 0) |
1983 | | MHD_USE_NO_THREAD_SAFETY, | ||
1983 | *pport, NULL, NULL, | 1984 | *pport, NULL, NULL, |
1984 | &ahcCheck, *ahc_param, | 1985 | &ahcCheck, *ahc_param, |
1985 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, | 1986 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, |
diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c index 00c83c63..9239ada5 100644 --- a/src/microhttpd/test_daemon.c +++ b/src/microhttpd/test_daemon.c | |||
@@ -116,14 +116,15 @@ testStartStop (void) | |||
116 | 116 | ||
117 | 117 | ||
118 | static unsigned int | 118 | static unsigned int |
119 | testExternalRun (void) | 119 | testExternalRun (int use_no_thread_safe) |
120 | { | 120 | { |
121 | struct MHD_Daemon *d; | 121 | struct MHD_Daemon *d; |
122 | fd_set rs; | 122 | fd_set rs; |
123 | MHD_socket maxfd; | 123 | MHD_socket maxfd; |
124 | int i; | 124 | int i; |
125 | 125 | ||
126 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 126 | d = MHD_start_daemon (MHD_USE_ERROR_LOG |
127 | | (use_no_thread_safe ? MHD_USE_NO_THREAD_SAFETY : 0), | ||
127 | 0, | 128 | 0, |
128 | &apc_all, NULL, | 129 | &apc_all, NULL, |
129 | &ahc_nothing, NULL, | 130 | &ahc_nothing, NULL, |
@@ -233,7 +234,9 @@ main (int argc, | |||
233 | errorCount += testStartError (); | 234 | errorCount += testStartError (); |
234 | if (has_threads_support) | 235 | if (has_threads_support) |
235 | errorCount += testStartStop (); | 236 | errorCount += testStartStop (); |
236 | errorCount += testExternalRun (); | 237 | if (has_threads_support) |
238 | errorCount += testExternalRun (0); | ||
239 | errorCount += testExternalRun (! 0); | ||
237 | if (has_threads_support) | 240 | if (has_threads_support) |
238 | { | 241 | { |
239 | errorCount += testThread (); | 242 | errorCount += testThread (); |
diff --git a/src/microhttpd/test_options.c b/src/microhttpd/test_options.c index 7be7666d..9e2d3b45 100644 --- a/src/microhttpd/test_options.c +++ b/src/microhttpd/test_options.c | |||
@@ -102,7 +102,7 @@ test_ip_addr_option (void) | |||
102 | 102 | ||
103 | ret = 0; | 103 | ret = 0; |
104 | 104 | ||
105 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 105 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
106 | NULL, NULL, &ahc_echo, NULL, | 106 | NULL, NULL, &ahc_echo, NULL, |
107 | MHD_OPTION_SOCK_ADDR, &daemon_ip_addr, | 107 | MHD_OPTION_SOCK_ADDR, &daemon_ip_addr, |
108 | MHD_OPTION_END); | 108 | MHD_OPTION_END); |
@@ -120,7 +120,7 @@ test_ip_addr_option (void) | |||
120 | 120 | ||
121 | 121 | ||
122 | daemon_ip_addr.sin_port = htons (port4); | 122 | daemon_ip_addr.sin_port = htons (port4); |
123 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 123 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
124 | NULL, NULL, &ahc_echo, NULL, | 124 | NULL, NULL, &ahc_echo, NULL, |
125 | MHD_OPTION_SOCK_ADDR_LEN, | 125 | MHD_OPTION_SOCK_ADDR_LEN, |
126 | (socklen_t) sizeof(daemon_ip_addr), &daemon_ip_addr, | 126 | (socklen_t) sizeof(daemon_ip_addr), &daemon_ip_addr, |
@@ -138,7 +138,7 @@ test_ip_addr_option (void) | |||
138 | MHD_stop_daemon (d); | 138 | MHD_stop_daemon (d); |
139 | 139 | ||
140 | 140 | ||
141 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 141 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
142 | NULL, NULL, &ahc_echo, NULL, | 142 | NULL, NULL, &ahc_echo, NULL, |
143 | MHD_OPTION_SOCK_ADDR_LEN, | 143 | MHD_OPTION_SOCK_ADDR_LEN, |
144 | (socklen_t) (sizeof(daemon_ip_addr) / 2), | 144 | (socklen_t) (sizeof(daemon_ip_addr) / 2), |
@@ -154,7 +154,7 @@ test_ip_addr_option (void) | |||
154 | #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN | 154 | #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN |
155 | 155 | ||
156 | daemon_ip_addr.sin_len = (socklen_t) sizeof(daemon_ip_addr); | 156 | daemon_ip_addr.sin_len = (socklen_t) sizeof(daemon_ip_addr); |
157 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 157 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
158 | NULL, NULL, &ahc_echo, NULL, | 158 | NULL, NULL, &ahc_echo, NULL, |
159 | MHD_OPTION_SOCK_ADDR_LEN, | 159 | MHD_OPTION_SOCK_ADDR_LEN, |
160 | (socklen_t) sizeof(daemon_ip_addr), &daemon_ip_addr, | 160 | (socklen_t) sizeof(daemon_ip_addr), &daemon_ip_addr, |
@@ -173,7 +173,7 @@ test_ip_addr_option (void) | |||
173 | 173 | ||
174 | 174 | ||
175 | daemon_ip_addr.sin_len = (socklen_t) (sizeof(daemon_ip_addr) / 2); | 175 | daemon_ip_addr.sin_len = (socklen_t) (sizeof(daemon_ip_addr) / 2); |
176 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 176 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
177 | NULL, NULL, &ahc_echo, NULL, | 177 | NULL, NULL, &ahc_echo, NULL, |
178 | MHD_OPTION_SOCK_ADDR_LEN, | 178 | MHD_OPTION_SOCK_ADDR_LEN, |
179 | (socklen_t) sizeof(daemon_ip_addr), &daemon_ip_addr, | 179 | (socklen_t) sizeof(daemon_ip_addr), &daemon_ip_addr, |
@@ -189,7 +189,8 @@ test_ip_addr_option (void) | |||
189 | 189 | ||
190 | 190 | ||
191 | #if defined(HAVE_INET6) && defined(USE_IPV6_TESTING) | 191 | #if defined(HAVE_INET6) && defined(USE_IPV6_TESTING) |
192 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_IPv6, 0, | 192 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_IPv6 |
193 | | MHD_USE_NO_THREAD_SAFETY, 0, | ||
193 | NULL, NULL, &ahc_echo, NULL, | 194 | NULL, NULL, &ahc_echo, NULL, |
194 | MHD_OPTION_SOCK_ADDR, &daemon_ip_addr6, | 195 | MHD_OPTION_SOCK_ADDR, &daemon_ip_addr6, |
195 | MHD_OPTION_END); | 196 | MHD_OPTION_END); |
@@ -207,7 +208,7 @@ test_ip_addr_option (void) | |||
207 | 208 | ||
208 | 209 | ||
209 | daemon_ip_addr6.sin6_port = htons (port6); | 210 | daemon_ip_addr6.sin6_port = htons (port6); |
210 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 211 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
211 | NULL, NULL, &ahc_echo, NULL, | 212 | NULL, NULL, &ahc_echo, NULL, |
212 | MHD_OPTION_SOCK_ADDR_LEN, | 213 | MHD_OPTION_SOCK_ADDR_LEN, |
213 | (socklen_t) sizeof(daemon_ip_addr6), &daemon_ip_addr6, | 214 | (socklen_t) sizeof(daemon_ip_addr6), &daemon_ip_addr6, |
@@ -225,7 +226,7 @@ test_ip_addr_option (void) | |||
225 | MHD_stop_daemon (d); | 226 | MHD_stop_daemon (d); |
226 | 227 | ||
227 | 228 | ||
228 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 229 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
229 | NULL, NULL, &ahc_echo, NULL, | 230 | NULL, NULL, &ahc_echo, NULL, |
230 | MHD_OPTION_SOCK_ADDR_LEN, | 231 | MHD_OPTION_SOCK_ADDR_LEN, |
231 | (socklen_t) (sizeof(daemon_ip_addr6) / 2), | 232 | (socklen_t) (sizeof(daemon_ip_addr6) / 2), |
@@ -241,7 +242,7 @@ test_ip_addr_option (void) | |||
241 | #if defined(HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN) | 242 | #if defined(HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN) |
242 | 243 | ||
243 | daemon_ip_addr6.sin6_len = (socklen_t) sizeof(daemon_ip_addr6); | 244 | daemon_ip_addr6.sin6_len = (socklen_t) sizeof(daemon_ip_addr6); |
244 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 245 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
245 | NULL, NULL, &ahc_echo, NULL, | 246 | NULL, NULL, &ahc_echo, NULL, |
246 | MHD_OPTION_SOCK_ADDR_LEN, | 247 | MHD_OPTION_SOCK_ADDR_LEN, |
247 | (socklen_t) sizeof(daemon_ip_addr6), &daemon_ip_addr6, | 248 | (socklen_t) sizeof(daemon_ip_addr6), &daemon_ip_addr6, |
@@ -260,7 +261,7 @@ test_ip_addr_option (void) | |||
260 | 261 | ||
261 | 262 | ||
262 | daemon_ip_addr6.sin6_len = (socklen_t) (sizeof(daemon_ip_addr6) / 2); | 263 | daemon_ip_addr6.sin6_len = (socklen_t) (sizeof(daemon_ip_addr6) / 2); |
263 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, | 264 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, 0, |
264 | NULL, NULL, &ahc_echo, NULL, | 265 | NULL, NULL, &ahc_echo, NULL, |
265 | MHD_OPTION_SOCK_ADDR_LEN, | 266 | MHD_OPTION_SOCK_ADDR_LEN, |
266 | (socklen_t) sizeof(daemon_ip_addr6), &daemon_ip_addr6, | 267 | (socklen_t) sizeof(daemon_ip_addr6), &daemon_ip_addr6, |
diff --git a/src/microhttpd/test_set_panic.c b/src/microhttpd/test_set_panic.c index cec361f6..ca9a0375 100644 --- a/src/microhttpd/test_set_panic.c +++ b/src/microhttpd/test_set_panic.c | |||
@@ -1469,7 +1469,8 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
1469 | 1469 | ||
1470 | if (testMhdThreadExternal == thrType) | 1470 | if (testMhdThreadExternal == thrType) |
1471 | d = MHD_start_daemon (((unsigned int) pollType) | 1471 | d = MHD_start_daemon (((unsigned int) pollType) |
1472 | | (verbose ? MHD_USE_ERROR_LOG : 0), | 1472 | | (verbose ? MHD_USE_ERROR_LOG : 0) |
1473 | | MHD_USE_NO_THREAD_SAFETY, | ||
1473 | *pport, NULL, NULL, | 1474 | *pport, NULL, NULL, |
1474 | &ahcCheck, *ahc_param, | 1475 | &ahcCheck, *ahc_param, |
1475 | MHD_OPTION_NOTIFY_CONNECTION, &socket_cb, | 1476 | MHD_OPTION_NOTIFY_CONNECTION, &socket_cb, |
diff --git a/src/microhttpd/test_start_stop.c b/src/microhttpd/test_start_stop.c index a64f3011..1031e12e 100644 --- a/src/microhttpd/test_start_stop.c +++ b/src/microhttpd/test_start_stop.c | |||
@@ -101,15 +101,31 @@ testMultithreadedPoolGet (unsigned int poll_flag) | |||
101 | } | 101 | } |
102 | 102 | ||
103 | 103 | ||
104 | static unsigned int | ||
105 | testExternalGet (void) | ||
106 | { | ||
107 | struct MHD_Daemon *d; | ||
108 | |||
109 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | ||
110 | 0, NULL, NULL, | ||
111 | &ahc_echo, NULL, | ||
112 | MHD_OPTION_END); | ||
113 | if (NULL == d) | ||
114 | return 8; | ||
115 | MHD_stop_daemon (d); | ||
116 | return 0; | ||
117 | } | ||
118 | |||
119 | |||
104 | #endif | 120 | #endif |
105 | 121 | ||
106 | 122 | ||
107 | static unsigned int | 123 | static unsigned int |
108 | testExternalGet (void) | 124 | testExternalGetSingleThread (void) |
109 | { | 125 | { |
110 | struct MHD_Daemon *d; | 126 | struct MHD_Daemon *d; |
111 | 127 | ||
112 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 128 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
113 | 0, NULL, NULL, | 129 | 0, NULL, NULL, |
114 | &ahc_echo, NULL, | 130 | &ahc_echo, NULL, |
115 | MHD_OPTION_END); | 131 | MHD_OPTION_END); |
@@ -132,8 +148,9 @@ main (int argc, | |||
132 | errorCount += testInternalGet (0); | 148 | errorCount += testInternalGet (0); |
133 | errorCount += testMultithreadedGet (0); | 149 | errorCount += testMultithreadedGet (0); |
134 | errorCount += testMultithreadedPoolGet (0); | 150 | errorCount += testMultithreadedPoolGet (0); |
135 | #endif | ||
136 | errorCount += testExternalGet (); | 151 | errorCount += testExternalGet (); |
152 | #endif | ||
153 | errorCount += testExternalGetSingleThread (); | ||
137 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) | 154 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) |
138 | if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_POLL)) | 155 | if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_POLL)) |
139 | { | 156 | { |
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 0abd5f10..22b15090 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c | |||
@@ -1275,7 +1275,8 @@ test_upgrade (unsigned int flags, | |||
1275 | done = false; | 1275 | done = false; |
1276 | 1276 | ||
1277 | if (! test_tls) | 1277 | if (! test_tls) |
1278 | d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE, | 1278 | d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE |
1279 | | MHD_USE_ITC, | ||
1279 | global_port, | 1280 | global_port, |
1280 | NULL, NULL, | 1281 | NULL, NULL, |
1281 | &ahc_upgrade, NULL, | 1282 | &ahc_upgrade, NULL, |
@@ -1289,7 +1290,7 @@ test_upgrade (unsigned int flags, | |||
1289 | #ifdef HTTPS_SUPPORT | 1290 | #ifdef HTTPS_SUPPORT |
1290 | else | 1291 | else |
1291 | d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE | 1292 | d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE |
1292 | | MHD_USE_TLS, | 1293 | | MHD_USE_TLS | MHD_USE_ITC, |
1293 | global_port, | 1294 | global_port, |
1294 | NULL, NULL, | 1295 | NULL, NULL, |
1295 | &ahc_upgrade, NULL, | 1296 | &ahc_upgrade, NULL, |
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c index 1939ccff..8ce55e2c 100644 --- a/src/testcurl/https/test_https_get_select.c +++ b/src/testcurl/https/test_https_get_select.c | |||
@@ -278,7 +278,9 @@ main (int argc, char *const *argv) | |||
278 | #ifdef EPOLL_SUPPORT | 278 | #ifdef EPOLL_SUPPORT |
279 | errorCount += testExternalGet (MHD_USE_EPOLL); | 279 | errorCount += testExternalGet (MHD_USE_EPOLL); |
280 | #endif | 280 | #endif |
281 | errorCount += testExternalGet (0); | 281 | if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_THREADS)) |
282 | errorCount += testExternalGet (MHD_NO_FLAG); | ||
283 | errorCount += testExternalGet (MHD_USE_NO_THREAD_SAFETY); | ||
282 | curl_global_cleanup (); | 284 | curl_global_cleanup (); |
283 | if (errorCount != 0) | 285 | if (errorCount != 0) |
284 | fprintf (stderr, "Failed test: %s, error: %u.\n", argv[0], errorCount); | 286 | fprintf (stderr, "Failed test: %s, error: %u.\n", argv[0], errorCount); |
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c index 0a8af562..c9f400a3 100644 --- a/src/testcurl/perf_get.c +++ b/src/testcurl/perf_get.c | |||
@@ -458,7 +458,7 @@ testExternalGet (uint16_t port) | |||
458 | multi = NULL; | 458 | multi = NULL; |
459 | cbc.buf = buf; | 459 | cbc.buf = buf; |
460 | cbc.size = 2048; | 460 | cbc.size = 2048; |
461 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 461 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c index 4fd651b3..2539b5f5 100644 --- a/src/testcurl/test_add_conn.c +++ b/src/testcurl/test_add_conn.c | |||
@@ -739,8 +739,7 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
739 | 739 | ||
740 | if (testMhdThreadExternal == thrType) | 740 | if (testMhdThreadExternal == thrType) |
741 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 741 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
742 | | (thrType == testMhdThreadExternal ? | 742 | | MHD_USE_NO_THREAD_SAFETY |
743 | 0 : MHD_USE_ITC) | ||
744 | | (no_listen ? MHD_USE_NO_LISTEN_SOCKET : 0) | 743 | | (no_listen ? MHD_USE_NO_LISTEN_SOCKET : 0) |
745 | | MHD_USE_ERROR_LOG, | 744 | | MHD_USE_ERROR_LOG, |
746 | *pport, NULL, NULL, | 745 | *pport, NULL, NULL, |
diff --git a/src/testcurl/test_basicauth.c b/src/testcurl/test_basicauth.c index 963639c9..d6fe1427 100644 --- a/src/testcurl/test_basicauth.c +++ b/src/testcurl/test_basicauth.c | |||
@@ -647,7 +647,7 @@ testBasicAuth (void) | |||
647 | else | 647 | else |
648 | port = 4210; | 648 | port = 4210; |
649 | 649 | ||
650 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 650 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c index 510043cc..3cc28c5f 100644 --- a/src/testcurl/test_callback.c +++ b/src/testcurl/test_callback.c | |||
@@ -141,7 +141,7 @@ main (int argc, char **argv) | |||
141 | else | 141 | else |
142 | port = 1140; | 142 | port = 1140; |
143 | 143 | ||
144 | d = MHD_start_daemon (0, | 144 | d = MHD_start_daemon (MHD_USE_NO_THREAD_SAFETY, |
145 | port, | 145 | port, |
146 | NULL, | 146 | NULL, |
147 | NULL, | 147 | NULL, |
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c index 681afe30..81fa9986 100644 --- a/src/testcurl/test_delete.c +++ b/src/testcurl/test_delete.c | |||
@@ -389,7 +389,7 @@ testExternalDelete (void) | |||
389 | cbc.buf = buf; | 389 | cbc.buf = buf; |
390 | cbc.size = 2048; | 390 | cbc.size = 2048; |
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 | MHD_USE_NO_THREAD_SAFETY, |
393 | port, | 393 | port, |
394 | NULL, NULL, &ahc_echo, &done_flag, | 394 | NULL, NULL, &ahc_echo, &done_flag, |
395 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 395 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_digestauth2.c b/src/testcurl/test_digestauth2.c index e94f7b63..2ec78e26 100644 --- a/src/testcurl/test_digestauth2.c +++ b/src/testcurl/test_digestauth2.c | |||
@@ -1366,7 +1366,7 @@ testDigestAuth (void) | |||
1366 | if (test_bind_uri) | 1366 | if (test_bind_uri) |
1367 | dauth_nonce_bind |= MHD_DAUTH_BIND_NONCE_URI_PARAMS; | 1367 | dauth_nonce_bind |= MHD_DAUTH_BIND_NONCE_URI_PARAMS; |
1368 | 1368 | ||
1369 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 1369 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
1370 | port, NULL, NULL, | 1370 | port, NULL, NULL, |
1371 | &ahc_echo, &rq_tr, | 1371 | &ahc_echo, &rq_tr, |
1372 | MHD_OPTION_DIGEST_AUTH_RANDOM_COPY, | 1372 | MHD_OPTION_DIGEST_AUTH_RANDOM_COPY, |
diff --git a/src/testcurl/test_digestauth_emu_ext.c b/src/testcurl/test_digestauth_emu_ext.c index 7a6e8e7b..8506a567 100644 --- a/src/testcurl/test_digestauth_emu_ext.c +++ b/src/testcurl/test_digestauth_emu_ext.c | |||
@@ -820,7 +820,7 @@ testDigestAuthEmu (void) | |||
820 | else | 820 | else |
821 | port = 4210; | 821 | port = 4210; |
822 | 822 | ||
823 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 823 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index b44c8370..812aa840 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -394,7 +394,7 @@ testMultithreadedPoolGet (uint32_t poll_flag) | |||
394 | 394 | ||
395 | 395 | ||
396 | static unsigned int | 396 | static unsigned int |
397 | testExternalGet (void) | 397 | testExternalGet (int thread_unsafe) |
398 | { | 398 | { |
399 | struct MHD_Daemon *d; | 399 | struct MHD_Daemon *d; |
400 | CURL *c; | 400 | CURL *c; |
@@ -424,7 +424,8 @@ testExternalGet (void) | |||
424 | cbc.buf = buf; | 424 | cbc.buf = buf; |
425 | cbc.size = 2048; | 425 | cbc.size = 2048; |
426 | cbc.pos = 0; | 426 | cbc.pos = 0; |
427 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 427 | d = MHD_start_daemon (MHD_USE_ERROR_LOG |
428 | | (thread_unsafe ? MHD_USE_NO_THREAD_SAFETY : 0), | ||
428 | global_port, NULL, NULL, | 429 | global_port, NULL, NULL, |
429 | &ahc_echo, NULL, | 430 | &ahc_echo, NULL, |
430 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 431 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
@@ -890,14 +891,20 @@ main (int argc, char *const *argv) | |||
890 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) | 891 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) |
891 | return 2; | 892 | return 2; |
892 | global_port = 0; | 893 | global_port = 0; |
893 | test_result = testExternalGet (); | 894 | test_result = testExternalGet (! 0); |
894 | if (test_result) | 895 | if (test_result) |
895 | fprintf (stderr, "FAILED: testExternalGet () - %u.\n", test_result); | 896 | fprintf (stderr, "FAILED: testExternalGet (!0) - %u.\n", test_result); |
896 | else if (verbose) | 897 | else if (verbose) |
897 | printf ("PASSED: testExternalGet ().\n"); | 898 | printf ("PASSED: testExternalGet ().\n"); |
898 | errorCount += test_result; | 899 | errorCount += test_result; |
899 | if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_THREADS)) | 900 | if (MHD_YES == MHD_is_feature_supported (MHD_FEATURE_THREADS)) |
900 | { | 901 | { |
902 | test_result += testExternalGet (0); | ||
903 | if (test_result) | ||
904 | fprintf (stderr, "FAILED: testExternalGet (0) - %u.\n", test_result); | ||
905 | else if (verbose) | ||
906 | printf ("PASSED: testExternalGet ().\n"); | ||
907 | errorCount += test_result; | ||
901 | test_result += testInternalGet (0); | 908 | test_result += testInternalGet (0); |
902 | if (test_result) | 909 | if (test_result) |
903 | fprintf (stderr, "FAILED: testInternalGet (0) - %u.\n", test_result); | 910 | fprintf (stderr, "FAILED: testInternalGet (0) - %u.\n", test_result); |
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c index 1b985ce2..9ffa8041 100644 --- a/src/testcurl/test_get_chunked.c +++ b/src/testcurl/test_get_chunked.c | |||
@@ -591,7 +591,7 @@ testExternalGet (void) | |||
591 | cbc.buf = buf; | 591 | cbc.buf = buf; |
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 | MHD_USE_NO_THREAD_SAFETY, |
595 | port, NULL, NULL, &ahc_echo, NULL, | 595 | port, NULL, NULL, &ahc_echo, NULL, |
596 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 596 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
597 | MHD_OPTION_END); | 597 | MHD_OPTION_END); |
diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c index 5771bec9..b84e9640 100644 --- a/src/testcurl/test_get_close_keep_alive.c +++ b/src/testcurl/test_get_close_keep_alive.c | |||
@@ -958,7 +958,7 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
958 | 958 | ||
959 | if (testMhdThreadExternal == thrType) | 959 | if (testMhdThreadExternal == thrType) |
960 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 960 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
961 | | MHD_USE_ERROR_LOG, | 961 | | MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
962 | *pport, NULL, NULL, | 962 | *pport, NULL, NULL, |
963 | &ahc_echo, NULL, | 963 | &ahc_echo, NULL, |
964 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, | 964 | MHD_OPTION_URI_LOG_CALLBACK, &log_cb, NULL, |
diff --git a/src/testcurl/test_get_iovec.c b/src/testcurl/test_get_iovec.c index 00e4fa3e..f1a83ece 100644 --- a/src/testcurl/test_get_iovec.c +++ b/src/testcurl/test_get_iovec.c | |||
@@ -481,7 +481,7 @@ testMultithreadedPoolGet (void) | |||
481 | 481 | ||
482 | 482 | ||
483 | static unsigned int | 483 | static unsigned int |
484 | testExternalGet (void) | 484 | testExternalGet (int thread_unsafe) |
485 | { | 485 | { |
486 | struct MHD_Daemon *d; | 486 | struct MHD_Daemon *d; |
487 | CURL *c; | 487 | CURL *c; |
@@ -516,7 +516,8 @@ testExternalGet (void) | |||
516 | cbc.buf = (char *) readbuf; | 516 | cbc.buf = (char *) readbuf; |
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 | | (thread_unsafe ? MHD_USE_NO_THREAD_SAFETY : 0), | ||
520 | port, NULL, NULL, &ahc_cont, NULL, | 521 | port, NULL, NULL, &ahc_cont, NULL, |
521 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 522 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
522 | MHD_OPTION_END); | 523 | MHD_OPTION_END); |
@@ -773,8 +774,9 @@ main (int argc, char *const *argv) | |||
773 | errorCount += testMultithreadedGet (); | 774 | errorCount += testMultithreadedGet (); |
774 | errorCount += testMultithreadedPoolGet (); | 775 | errorCount += testMultithreadedPoolGet (); |
775 | errorCount += testUnknownPortGet (); | 776 | errorCount += testUnknownPortGet (); |
777 | errorCount += testExternalGet (0); | ||
776 | } | 778 | } |
777 | errorCount += testExternalGet (); | 779 | errorCount += testExternalGet (! 0); |
778 | if (errorCount != 0) | 780 | if (errorCount != 0) |
779 | fprintf (stderr, "Error (code: %u)\n", errorCount); | 781 | fprintf (stderr, "Error (code: %u)\n", errorCount); |
780 | curl_global_cleanup (); | 782 | curl_global_cleanup (); |
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c index 698a7c2e..01be8122 100644 --- a/src/testcurl/test_get_sendfile.c +++ b/src/testcurl/test_get_sendfile.c | |||
@@ -337,7 +337,7 @@ testMultithreadedPoolGet (void) | |||
337 | 337 | ||
338 | 338 | ||
339 | static unsigned int | 339 | static unsigned int |
340 | testExternalGet (void) | 340 | testExternalGet (int thread_unsafe) |
341 | { | 341 | { |
342 | struct MHD_Daemon *d; | 342 | struct MHD_Daemon *d; |
343 | CURL *c; | 343 | CURL *c; |
@@ -373,7 +373,8 @@ testExternalGet (void) | |||
373 | cbc.buf = buf; | 373 | cbc.buf = buf; |
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 | | (thread_unsafe ? MHD_USE_NO_THREAD_SAFETY : 0), | ||
377 | port, NULL, NULL, &ahc_echo, NULL, | 378 | port, NULL, NULL, &ahc_echo, NULL, |
378 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 379 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
379 | MHD_OPTION_END); | 380 | MHD_OPTION_END); |
@@ -660,8 +661,9 @@ main (int argc, char *const *argv) | |||
660 | errorCount += testMultithreadedGet (); | 661 | errorCount += testMultithreadedGet (); |
661 | errorCount += testMultithreadedPoolGet (); | 662 | errorCount += testMultithreadedPoolGet (); |
662 | errorCount += testUnknownPortGet (); | 663 | errorCount += testUnknownPortGet (); |
664 | errorCount += testExternalGet (0); | ||
663 | } | 665 | } |
664 | errorCount += testExternalGet (); | 666 | errorCount += testExternalGet (! 0); |
665 | if (errorCount != 0) | 667 | if (errorCount != 0) |
666 | fprintf (stderr, "Error (code: %u)\n", errorCount); | 668 | fprintf (stderr, "Error (code: %u)\n", errorCount); |
667 | curl_global_cleanup (); | 669 | curl_global_cleanup (); |
diff --git a/src/testcurl/test_head.c b/src/testcurl/test_head.c index 4f820880..226663d3 100644 --- a/src/testcurl/test_head.c +++ b/src/testcurl/test_head.c | |||
@@ -756,7 +756,7 @@ testHead (void) | |||
756 | else | 756 | else |
757 | port = 4220 + oneone ? 0 : 1; | 757 | port = 4220 + oneone ? 0 : 1; |
758 | 758 | ||
759 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 759 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c index d2612fa8..64669a44 100644 --- a/src/testcurl/test_large_put.c +++ b/src/testcurl/test_large_put.c | |||
@@ -647,7 +647,7 @@ testPutExternal (void) | |||
647 | cbc.size = 2048; | 647 | cbc.size = 2048; |
648 | cbc.pos = 0; | 648 | cbc.pos = 0; |
649 | multi = NULL; | 649 | multi = NULL; |
650 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 650 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
651 | port, | 651 | port, |
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, |
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c index d81f0765..41c408a9 100644 --- a/src/testcurl/test_parse_cookies.c +++ b/src/testcurl/test_parse_cookies.c | |||
@@ -1646,7 +1646,7 @@ testExternalPolling (void) | |||
1646 | else | 1646 | else |
1647 | port = 1340 + oneone ? 0 : 6 + (uint16_t) (1 + discp_level); | 1647 | port = 1340 + oneone ? 0 : 6 + (uint16_t) (1 + discp_level); |
1648 | 1648 | ||
1649 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 1649 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
1650 | port, NULL, NULL, | 1650 | port, NULL, NULL, |
1651 | &ahcCheck, &ahc_param, | 1651 | &ahcCheck, &ahc_param, |
1652 | MHD_OPTION_CLIENT_DISCIPLINE_LVL, | 1652 | MHD_OPTION_CLIENT_DISCIPLINE_LVL, |
diff --git a/src/testcurl/test_patch.c b/src/testcurl/test_patch.c index e5f37901..c13712e0 100644 --- a/src/testcurl/test_patch.c +++ b/src/testcurl/test_patch.c | |||
@@ -374,7 +374,7 @@ testExternalPut (void) | |||
374 | cbc.buf = buf; | 374 | cbc.buf = buf; |
375 | cbc.size = 2048; | 375 | cbc.size = 2048; |
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 | MHD_USE_NO_THREAD_SAFETY, |
378 | port, | 378 | port, |
379 | NULL, NULL, &ahc_echo, &done_flag, | 379 | NULL, NULL, &ahc_echo, &done_flag, |
380 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 380 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c index 3f64c0a4..58409cc1 100644 --- a/src/testcurl/test_post.c +++ b/src/testcurl/test_post.c | |||
@@ -433,7 +433,7 @@ testExternalPost (void) | |||
433 | cbc.buf = buf; | 433 | cbc.buf = buf; |
434 | cbc.size = 2048; | 434 | cbc.size = 2048; |
435 | cbc.pos = 0; | 435 | cbc.pos = 0; |
436 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 436 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c index 7144abdd..5f2b7ad3 100644 --- a/src/testcurl/test_post_loop.c +++ b/src/testcurl/test_post_loop.c | |||
@@ -431,7 +431,7 @@ testExternalPost (void) | |||
431 | cbc.buf = buf; | 431 | cbc.buf = buf; |
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 | MHD_USE_NO_THREAD_SAFETY, |
435 | port, NULL, NULL, &ahc_echo, NULL, | 435 | port, NULL, NULL, &ahc_echo, NULL, |
436 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 436 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
437 | MHD_OPTION_END); | 437 | MHD_OPTION_END); |
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c index bbd0d137..32809fa9 100644 --- a/src/testcurl/test_postform.c +++ b/src/testcurl/test_postform.c | |||
@@ -557,7 +557,7 @@ testExternalPost (void) | |||
557 | cbc.buf = buf; | 557 | cbc.buf = buf; |
558 | cbc.size = 2048; | 558 | cbc.size = 2048; |
559 | cbc.pos = 0; | 559 | cbc.pos = 0; |
560 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 560 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_process_arguments.c b/src/testcurl/test_process_arguments.c index f9720b89..8f010057 100644 --- a/src/testcurl/test_process_arguments.c +++ b/src/testcurl/test_process_arguments.c | |||
@@ -149,7 +149,7 @@ testExternalGet (void) | |||
149 | cbc.buf = buf; | 149 | cbc.buf = buf; |
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 | MHD_USE_NO_THREAD_SAFETY, |
153 | port, NULL, NULL, &ahc_echo, NULL, | 153 | port, NULL, NULL, &ahc_echo, NULL, |
154 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 154 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
155 | MHD_OPTION_END); | 155 | MHD_OPTION_END); |
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c index ce30b8a9..34f52d5a 100644 --- a/src/testcurl/test_process_headers.c +++ b/src/testcurl/test_process_headers.c | |||
@@ -406,7 +406,7 @@ testExternalGet (void) | |||
406 | cbc.buf = buf; | 406 | cbc.buf = buf; |
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 | MHD_USE_NO_THREAD_SAFETY, |
410 | port, NULL, NULL, &ahc_echo, NULL, | 410 | port, NULL, NULL, &ahc_echo, NULL, |
411 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 411 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
412 | MHD_OPTION_END); | 412 | MHD_OPTION_END); |
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c index 97ed8591..e321a0b4 100644 --- a/src/testcurl/test_put.c +++ b/src/testcurl/test_put.c | |||
@@ -398,7 +398,7 @@ testExternalPut (void) | |||
398 | cbc.buf = buf; | 398 | cbc.buf = buf; |
399 | cbc.size = 2048; | 399 | cbc.size = 2048; |
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 | MHD_USE_NO_THREAD_SAFETY, |
402 | port, | 402 | port, |
403 | NULL, NULL, &ahc_echo, &done_flag, | 403 | NULL, NULL, &ahc_echo, &done_flag, |
404 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, | 404 | MHD_OPTION_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_put_broken_len.c b/src/testcurl/test_put_broken_len.c index 65e8cd82..52a48c79 100644 --- a/src/testcurl/test_put_broken_len.c +++ b/src/testcurl/test_put_broken_len.c | |||
@@ -628,7 +628,7 @@ performTest (void) | |||
628 | else | 628 | else |
629 | port = 4220 + oneone ? 0 : 1; | 629 | port = 4220 + oneone ? 0 : 1; |
630 | 630 | ||
631 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 631 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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_APP_FD_SETSIZE, (int) FD_SETSIZE, |
diff --git a/src/testcurl/test_put_header_fold.c b/src/testcurl/test_put_header_fold.c index 9b77ed99..ad9b7450 100644 --- a/src/testcurl/test_put_header_fold.c +++ b/src/testcurl/test_put_header_fold.c | |||
@@ -1147,7 +1147,7 @@ performCheck (void) | |||
1147 | mem_limit = (size_t) ((TEST_UPLOAD_DATA_SIZE * 4) / 3 + 2 | 1147 | mem_limit = (size_t) ((TEST_UPLOAD_DATA_SIZE * 4) / 3 + 2 |
1148 | + HEADERS_POINTERS_SIZE); | 1148 | + HEADERS_POINTERS_SIZE); |
1149 | 1149 | ||
1150 | d = MHD_start_daemon (MHD_USE_ERROR_LOG, | 1150 | d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_NO_THREAD_SAFETY, |
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, |
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c index e5d519c3..414f5c4f 100644 --- a/src/testcurl/test_toolarge.c +++ b/src/testcurl/test_toolarge.c | |||
@@ -1453,7 +1453,8 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
1453 | 1453 | ||
1454 | if (testMhdThreadExternal == thrType) | 1454 | if (testMhdThreadExternal == thrType) |
1455 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 1455 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
1456 | | (verbose ? MHD_USE_ERROR_LOG : 0), | 1456 | | (verbose ? MHD_USE_ERROR_LOG : 0) |
1457 | | MHD_USE_NO_THREAD_SAFETY, | ||
1457 | *pport, NULL, NULL, | 1458 | *pport, NULL, NULL, |
1458 | &ahcCheck, *ahc_param, | 1459 | &ahcCheck, *ahc_param, |
1459 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, | 1460 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, |
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c index b3f52484..8cb53a80 100644 --- a/src/testcurl/test_tricky.c +++ b/src/testcurl/test_tricky.c | |||
@@ -964,7 +964,8 @@ startTestMhdDaemon (enum testMhdThreadsType thrType, | |||
964 | 964 | ||
965 | if (testMhdThreadExternal == thrType) | 965 | if (testMhdThreadExternal == thrType) |
966 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) | 966 | d = MHD_start_daemon (((unsigned int) thrType) | ((unsigned int) pollType) |
967 | | (verbose ? MHD_USE_ERROR_LOG : 0), | 967 | | (verbose ? MHD_USE_ERROR_LOG : 0) |
968 | | MHD_USE_NO_THREAD_SAFETY, | ||
968 | *pport, NULL, NULL, | 969 | *pport, NULL, NULL, |
969 | &ahcCheck, *ahc_param, | 970 | &ahcCheck, *ahc_param, |
970 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, | 971 | MHD_OPTION_URI_LOG_CALLBACK, &check_uri_cb, |
diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c index c1a245d6..a687555a 100644 --- a/src/testzzuf/test_get.c +++ b/src/testzzuf/test_get.c | |||
@@ -1272,9 +1272,12 @@ print_test_starting (unsigned int daemon_flags) | |||
1272 | else | 1272 | else |
1273 | { | 1273 | { |
1274 | if (0 != (MHD_USE_EPOLL & daemon_flags)) | 1274 | if (0 != (MHD_USE_EPOLL & daemon_flags)) |
1275 | printf ("\nStarting test with external polling and internal 'epoll'.\n"); | 1275 | printf ("\nStarting test with%s thread safety with external polling " |
1276 | "and internal 'epoll'.\n", | ||
1277 | ((0 != (MHD_USE_NO_THREAD_SAFETY & daemon_flags)) ? "out" : "")); | ||
1276 | else | 1278 | else |
1277 | printf ("\nStarting test with external polling.\n"); | 1279 | printf ("\nStarting test with%s thread safety with external polling.\n", |
1280 | ((0 != (MHD_USE_NO_THREAD_SAFETY & daemon_flags)) ? "out" : "")); | ||
1278 | } | 1281 | } |
1279 | fflush (stdout); | 1282 | fflush (stdout); |
1280 | } | 1283 | } |
@@ -1623,8 +1626,9 @@ run_all_checks (void) | |||
1623 | if ((77 == testRes) || (99 == testRes)) | 1626 | if ((77 == testRes) || (99 == testRes)) |
1624 | return testRes; | 1627 | return testRes; |
1625 | } | 1628 | } |
1629 | testRes = testExternalPolling (&port, MHD_NO_FLAG); | ||
1626 | } | 1630 | } |
1627 | testRes = testExternalPolling (&port, MHD_NO_FLAG); | 1631 | testRes = testExternalPolling (&port, MHD_USE_NO_THREAD_SAFETY); |
1628 | if ((77 == testRes) || (99 == testRes)) | 1632 | if ((77 == testRes) || (99 == testRes)) |
1629 | return testRes; | 1633 | return testRes; |
1630 | ret += testRes; | 1634 | ret += testRes; |