aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-11-08 19:41:28 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-11-08 19:41:28 +0300
commitd5245634c224c7169634ce4c34e800447f426c87 (patch)
tree73a40428811ab644687dd5fe35aac03df8b52ac2 /src
parent2636c2090dc7bfceda3cc3541d6ef2133e18de5d (diff)
downloadlibmicrohttpd-d5245634c224c7169634ce4c34e800447f426c87.tar.gz
libmicrohttpd-d5245634c224c7169634ce4c34e800447f426c87.zip
Added MHD_USE_ERROR_LOG flag with same value as MHD_USE_DEBUG.
New name better explains flag actions.
Diffstat (limited to 'src')
-rw-r--r--src/examples/authorization_example.c2
-rw-r--r--src/examples/chunked_example.c8
-rw-r--r--src/examples/demo.c2
-rw-r--r--src/examples/demo_https.c2
-rw-r--r--src/examples/digest_auth_example.c2
-rw-r--r--src/examples/dual_stack_example.c2
-rw-r--r--src/examples/fileserver_example.c2
-rw-r--r--src/examples/fileserver_example_dirs.c2
-rw-r--r--src/examples/fileserver_example_external_select.c2
-rw-r--r--src/examples/https_fileserver_example.c2
-rw-r--r--src/examples/minimal_example.c8
-rw-r--r--src/examples/minimal_example_comet.c2
-rw-r--r--src/examples/post_example.c2
-rw-r--r--src/examples/querystring_example.c2
-rw-r--r--src/examples/refuse_post_example.c2
-rw-r--r--src/examples/upgrade_example.c2
-rw-r--r--src/include/microhttpd.h7
-rw-r--r--src/microhttpd/connection.c2
-rw-r--r--src/microhttpd/internal.c2
-rw-r--r--src/microhttpd/test_daemon.c10
-rw-r--r--src/microhttpd/test_upgrade.c4
-rw-r--r--src/testcurl/https/test_empty_response.c2
-rw-r--r--src/testcurl/https/test_https_get.c4
-rw-r--r--src/testcurl/https/test_https_get_parallel.c8
-rw-r--r--src/testcurl/https/test_https_get_parallel_threads.c4
-rw-r--r--src/testcurl/https/test_https_get_select.c2
-rw-r--r--src/testcurl/https/test_https_multi_daemon.c4
-rw-r--r--src/testcurl/https/test_https_session_info.c2
-rw-r--r--src/testcurl/https/test_https_sni.c2
-rw-r--r--src/testcurl/https/test_https_time_out.c2
-rw-r--r--src/testcurl/https/test_tls_authentication.c2
-rw-r--r--src/testcurl/https/test_tls_extensions.c2
-rw-r--r--src/testcurl/https/test_tls_options.c2
-rw-r--r--src/testcurl/perf_get.c8
-rw-r--r--src/testcurl/perf_get_concurrent.c8
-rw-r--r--src/testcurl/test_concurrent_stop.c4
-rw-r--r--src/testcurl/test_delete.c8
-rw-r--r--src/testcurl/test_digestauth.c2
-rw-r--r--src/testcurl/test_digestauth_with_arguments.c2
-rw-r--r--src/testcurl/test_get.c14
-rw-r--r--src/testcurl/test_get_chunked.c8
-rw-r--r--src/testcurl/test_get_response_cleanup.c8
-rw-r--r--src/testcurl/test_get_sendfile.c10
-rw-r--r--src/testcurl/test_iplimit.c4
-rw-r--r--src/testcurl/test_large_put.c8
-rw-r--r--src/testcurl/test_long_header.c4
-rw-r--r--src/testcurl/test_options.c4
-rw-r--r--src/testcurl/test_parse_cookies.c2
-rw-r--r--src/testcurl/test_post.c10
-rw-r--r--src/testcurl/test_post_loop.c8
-rw-r--r--src/testcurl/test_postform.c8
-rw-r--r--src/testcurl/test_process_arguments.c2
-rw-r--r--src/testcurl/test_process_headers.c8
-rw-r--r--src/testcurl/test_put.c8
-rw-r--r--src/testcurl/test_put_chunked.c8
-rw-r--r--src/testcurl/test_quiesce.c8
-rw-r--r--src/testcurl/test_start_stop.c8
-rw-r--r--src/testcurl/test_termination.c2
-rw-r--r--src/testcurl/test_timeout.c4
-rw-r--r--src/testcurl/test_urlparse.c2
-rw-r--r--src/testzzuf/test_get.c6
-rw-r--r--src/testzzuf/test_get_chunked.c6
-rw-r--r--src/testzzuf/test_long_header.c4
-rw-r--r--src/testzzuf/test_post.c6
-rw-r--r--src/testzzuf/test_post_form.c6
-rw-r--r--src/testzzuf/test_put.c6
-rw-r--r--src/testzzuf/test_put_chunked.c6
-rw-r--r--src/testzzuf/test_put_large.c6
68 files changed, 164 insertions, 157 deletions
diff --git a/src/examples/authorization_example.c b/src/examples/authorization_example.c
index eb478104..d34e6e18 100644
--- a/src/examples/authorization_example.c
+++ b/src/examples/authorization_example.c
@@ -106,7 +106,7 @@ main (int argc, char *const *argv)
106 return 1; 106 return 1;
107 } 107 }
108 108
109 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 109 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
110 atoi (argv[1]), 110 atoi (argv[1]),
111 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); 111 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
112 if (d == NULL) 112 if (d == NULL)
diff --git a/src/examples/chunked_example.c b/src/examples/chunked_example.c
index c9baa5b4..98987aec 100644
--- a/src/examples/chunked_example.c
+++ b/src/examples/chunked_example.c
@@ -78,10 +78,10 @@ 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_POLL, 81 d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL,
82 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 82 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
83 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, 83 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG | MHD_USE_POLL,
84 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 84 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
85 atoi (argv[1]), 85 atoi (argv[1]),
86 NULL, NULL, &ahc_echo, NULL, 86 NULL, NULL, &ahc_echo, NULL,
87 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, 87 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
diff --git a/src/examples/demo.c b/src/examples/demo.c
index ef2a1780..40ffcc2d 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG 886 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG
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 ee8643c0..f9734de9 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_TLS 935 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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/digest_auth_example.c b/src/examples/digest_auth_example.c
index 62c99cfa..82317af2 100644
--- a/src/examples/digest_auth_example.c
+++ b/src/examples/digest_auth_example.c
@@ -123,7 +123,7 @@ main (int argc, char *const *argv)
123 off += len; 123 off += len;
124 } 124 }
125 (void) close(fd); 125 (void) close(fd);
126 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 126 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
127 atoi (argv[1]), 127 atoi (argv[1]),
128 NULL, NULL, &ahc_echo, PAGE, 128 NULL, NULL, &ahc_echo, PAGE,
129 MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof(rnd), rnd, 129 MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof(rnd), rnd,
diff --git a/src/examples/dual_stack_example.c b/src/examples/dual_stack_example.c
index 04ca3ca1..6b3cef83 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_DUAL_STACK, 71 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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/fileserver_example.c b/src/examples/fileserver_example.c
index 9637bffc..546e2e1a 100644
--- a/src/examples/fileserver_example.c
+++ b/src/examples/fileserver_example.c
@@ -129,7 +129,7 @@ main (int argc, char *const *argv)
129 printf ("%s PORT\n", argv[0]); 129 printf ("%s PORT\n", argv[0]);
130 return 1; 130 return 1;
131 } 131 }
132 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 132 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
133 atoi (argv[1]), 133 atoi (argv[1]),
134 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); 134 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
135 if (d == NULL) 135 if (d == NULL)
diff --git a/src/examples/fileserver_example_dirs.c b/src/examples/fileserver_example_dirs.c
index e0a6362c..c6a86e02 100644
--- a/src/examples/fileserver_example_dirs.c
+++ b/src/examples/fileserver_example_dirs.c
@@ -190,7 +190,7 @@ main (int argc, char *const *argv)
190 printf ("%s PORT\n", argv[0]); 190 printf ("%s PORT\n", argv[0]);
191 return 1; 191 return 1;
192 } 192 }
193 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 193 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
194 atoi (argv[1]), 194 atoi (argv[1]),
195 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); 195 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
196 if (NULL == d) 196 if (NULL == d)
diff --git a/src/examples/fileserver_example_external_select.c b/src/examples/fileserver_example_external_select.c
index 6f7d83c4..1ae79e16 100644
--- a/src/examples/fileserver_example_external_select.c
+++ b/src/examples/fileserver_example_external_select.c
@@ -135,7 +135,7 @@ main (int argc, char *const *argv)
135 printf ("%s PORT SECONDS-TO-RUN\n", argv[0]); 135 printf ("%s PORT SECONDS-TO-RUN\n", argv[0]);
136 return 1; 136 return 1;
137 } 137 }
138 d = MHD_start_daemon (MHD_USE_DEBUG, 138 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
139 atoi (argv[1]), 139 atoi (argv[1]),
140 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); 140 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
141 if (d == NULL) 141 if (d == NULL)
diff --git a/src/examples/https_fileserver_example.c b/src/examples/https_fileserver_example.c
index 0b072cfc..b2862af3 100644
--- a/src/examples/https_fileserver_example.c
+++ b/src/examples/https_fileserver_example.c
@@ -191,7 +191,7 @@ main (int argc, char *const *argv)
191 /* TODO check if this is truly necessary - disallow usage of the blocking /dev/random */ 191 /* TODO check if this is truly necessary - disallow usage of the blocking /dev/random */
192 /* gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); */ 192 /* gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); */
193 TLS_daemon = 193 TLS_daemon =
194 MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | 194 MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG |
195 MHD_USE_TLS, atoi (argv[1]), NULL, NULL, &http_ahc, 195 MHD_USE_TLS, atoi (argv[1]), NULL, NULL, &http_ahc,
196 NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256, 196 NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256,
197 MHD_OPTION_HTTPS_MEM_KEY, key_pem, 197 MHD_OPTION_HTTPS_MEM_KEY, key_pem,
diff --git a/src/examples/minimal_example.c b/src/examples/minimal_example.c
index a1138f20..c356210d 100644
--- a/src/examples/minimal_example.c
+++ b/src/examples/minimal_example.c
@@ -67,10 +67,10 @@ 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | MHD_USE_POLL, 70 d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL,
71 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 71 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
72 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG | MHD_USE_POLL, 72 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG | MHD_USE_POLL,
73 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 73 // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
74 atoi (argv[1]), 74 atoi (argv[1]),
75 NULL, NULL, &ahc_echo, PAGE, 75 NULL, NULL, &ahc_echo, PAGE,
76 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120, 76 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
diff --git a/src/examples/minimal_example_comet.c b/src/examples/minimal_example_comet.c
index 0c9d264b..83057ae2 100644
--- a/src/examples/minimal_example_comet.c
+++ b/src/examples/minimal_example_comet.c
@@ -74,7 +74,7 @@ main (int argc, char *const *argv)
74 printf ("%s PORT\n", argv[0]); 74 printf ("%s PORT\n", argv[0]);
75 return 1; 75 return 1;
76 } 76 }
77 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 77 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
78 atoi (argv[1]), 78 atoi (argv[1]),
79 NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); 79 NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
80 if (d == NULL) 80 if (d == NULL)
diff --git a/src/examples/post_example.c b/src/examples/post_example.c
index d0872cc5..2d83e0a4 100644
--- a/src/examples/post_example.c
+++ b/src/examples/post_example.c
@@ -715,7 +715,7 @@ main (int argc, char *const *argv)
715 } 715 }
716 /* initialize PRNG */ 716 /* initialize PRNG */
717 srand ((unsigned int) time (NULL)); 717 srand ((unsigned int) time (NULL));
718 d = MHD_start_daemon (MHD_USE_DEBUG, 718 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
719 atoi (argv[1]), 719 atoi (argv[1]),
720 NULL, NULL, 720 NULL, NULL,
721 &create_response, NULL, 721 &create_response, NULL,
diff --git a/src/examples/querystring_example.c b/src/examples/querystring_example.c
index 24f8ae4c..9844afd3 100644
--- a/src/examples/querystring_example.c
+++ b/src/examples/querystring_example.c
@@ -79,7 +79,7 @@ main (int argc, char *const *argv)
79 printf ("%s PORT\n", argv[0]); 79 printf ("%s PORT\n", argv[0]);
80 return 1; 80 return 1;
81 } 81 }
82 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 82 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
83 atoi (argv[1]), 83 atoi (argv[1]),
84 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END); 84 NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
85 if (d == NULL) 85 if (d == NULL)
diff --git a/src/examples/refuse_post_example.c b/src/examples/refuse_post_example.c
index 846546c4..a834b952 100644
--- a/src/examples/refuse_post_example.c
+++ b/src/examples/refuse_post_example.c
@@ -86,7 +86,7 @@ main (int argc, char *const *argv)
86 printf ("%s PORT\n", argv[0]); 86 printf ("%s PORT\n", argv[0]);
87 return 1; 87 return 1;
88 } 88 }
89 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG, 89 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_ERROR_LOG,
90 atoi (argv[1]), 90 atoi (argv[1]),
91 NULL, NULL, &ahc_echo, (void *) askpage, 91 NULL, NULL, &ahc_echo, (void *) askpage,
92 MHD_OPTION_END); 92 MHD_OPTION_END);
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c
index c03755f4..dcb20fc8 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 278 d = MHD_start_daemon (MHD_ALLOW_UPGRADE | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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 535a2d51..0f3e4873 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -533,6 +533,13 @@ enum MHD_FLAG
533 MHD_NO_FLAG = 0, 533 MHD_NO_FLAG = 0,
534 534
535 /** 535 /**
536 * Print errors messages to custom error logger or to `stderr` if
537 * custom error logger is not set.
538 * @sa ::MHD_OPTION_EXTERNAL_LOGGER
539 */
540 MHD_USE_ERROR_LOG = 1,
541
542 /**
536 * Run in debug mode. If this flag is used, the library should 543 * Run in debug mode. If this flag is used, the library should
537 * print error messages and warnings to `stderr`. 544 * print error messages and warnings to `stderr`.
538 */ 545 */
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index f256cb8f..3b9b0ceb 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3290,7 +3290,7 @@ MHD_connection_epoll_update_ (struct MHD_Connection *connection)
3290 &event)) 3290 &event))
3291 { 3291 {
3292#ifdef HAVE_MESSAGES 3292#ifdef HAVE_MESSAGES
3293 if (0 != (daemon->options & MHD_USE_DEBUG)) 3293 if (0 != (daemon->options & MHD_USE_ERROR_LOG))
3294 MHD_DLOG (daemon, 3294 MHD_DLOG (daemon,
3295 _("Call to epoll_ctl failed: %s\n"), 3295 _("Call to epoll_ctl failed: %s\n"),
3296 MHD_socket_last_strerr_ ()); 3296 MHD_socket_last_strerr_ ());
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index aa5a3596..966f5621 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -99,7 +99,7 @@ MHD_DLOG (const struct MHD_Daemon *daemon,
99{ 99{
100 va_list va; 100 va_list va;
101 101
102 if (0 == (daemon->options & MHD_USE_DEBUG)) 102 if (0 == (daemon->options & MHD_USE_ERROR_LOG))
103 return; 103 return;
104 va_start (va, format); 104 va_start (va, format);
105 daemon->custom_error_log (daemon->custom_error_log_cls, 105 daemon->custom_error_log (daemon->custom_error_log_cls,
diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c
index 4692085e..169ebb60 100644
--- a/src/microhttpd/test_daemon.c
+++ b/src/microhttpd/test_daemon.c
@@ -40,7 +40,7 @@ testStartError ()
40{ 40{
41 struct MHD_Daemon *d; 41 struct MHD_Daemon *d;
42 42
43 d = MHD_start_daemon (MHD_USE_DEBUG, 0, NULL, NULL, NULL, NULL); 43 d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, NULL, NULL, NULL, NULL);
44 if (d != NULL) 44 if (d != NULL)
45 return 1; 45 return 1;
46 return 0; 46 return 0;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 78 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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);
@@ -93,7 +93,7 @@ testExternalRun ()
93 MHD_socket maxfd; 93 MHD_socket maxfd;
94 int i; 94 int i;
95 95
96 d = MHD_start_daemon (MHD_USE_DEBUG, 96 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
97 1081, 97 1081,
98 &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); 98 &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END);
99 99
@@ -124,7 +124,7 @@ static int
124testThread () 124testThread ()
125{ 125{
126 struct MHD_Daemon *d; 126 struct MHD_Daemon *d;
127 d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_INTERNAL_POLLING_THREAD, 127 d = MHD_start_daemon (MHD_USE_ERROR_LOG | 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
@@ -140,7 +140,7 @@ static int
140testMultithread () 140testMultithread ()
141{ 141{
142 struct MHD_Daemon *d; 142 struct MHD_Daemon *d;
143 d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION, 143 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION,
144 1083, 144 1083,
145 &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END); 145 &apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END);
146 146
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index b28519dc..b74bdc0a 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -1004,7 +1004,7 @@ test_upgrade (int flags,
1004 done = 0; 1004 done = 0;
1005 1005
1006 if (!test_tls) 1006 if (!test_tls)
1007 d = MHD_start_daemon (flags | MHD_USE_DEBUG | MHD_ALLOW_UPGRADE, 1007 d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE,
1008 1080, 1008 1080,
1009 NULL, NULL, 1009 NULL, NULL,
1010 &ahc_upgrade, NULL, 1010 &ahc_upgrade, NULL,
@@ -1015,7 +1015,7 @@ test_upgrade (int flags,
1015 MHD_OPTION_END); 1015 MHD_OPTION_END);
1016#ifdef HTTPS_SUPPORT 1016#ifdef HTTPS_SUPPORT
1017 else 1017 else
1018 d = MHD_start_daemon (flags | MHD_USE_DEBUG | MHD_ALLOW_UPGRADE | MHD_USE_TLS, 1018 d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE | MHD_USE_TLS,
1019 1080, 1019 1080,
1020 NULL, NULL, 1020 NULL, NULL,
1021 &ahc_upgrade, NULL, 1021 &ahc_upgrade, NULL,
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index dbc05640..2acc820f 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_INTERNAL_POLLING_THREAD, 83 d = MHD_start_daemon (MHD_USE_ERROR_LOG | 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.c b/src/testcurl/https/test_https_get.c
index 9882fc57..f5b47e65 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -47,7 +47,7 @@ test_cipher_option (FILE * test_fd,
47 int ret; 47 int ret;
48 struct MHD_Daemon *d; 48 struct MHD_Daemon *d;
49 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 49 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
50 MHD_USE_DEBUG, 4233, 50 MHD_USE_ERROR_LOG, 4233,
51 NULL, NULL, &http_ahc, NULL, 51 NULL, NULL, &http_ahc, NULL,
52 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 52 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
53 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 53 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -76,7 +76,7 @@ test_secure_get (FILE * test_fd,
76 struct MHD_Daemon *d; 76 struct MHD_Daemon *d;
77 77
78 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 78 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
79 MHD_USE_DEBUG, 4233, 79 MHD_USE_ERROR_LOG, 4233,
80 NULL, NULL, &http_ahc, NULL, 80 NULL, NULL, &http_ahc, NULL,
81 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, 81 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
82 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, 82 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
index 4b33e010..d9d6eefa 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_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL, 154 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG | 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_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG, 162 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG,
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_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_EPOLL, 170 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG | 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_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG, 178 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG,
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/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c
index d057e792..ef1ecf69 100644
--- a/src/testcurl/https/test_https_get_parallel_threads.c
+++ b/src/testcurl/https/test_https_get_parallel_threads.c
@@ -170,7 +170,7 @@ main (int argc, char *const *argv)
170 errorCount += 170 errorCount +=
171 test_wrap ("multi threaded daemon, single client", &test_single_client, 171 test_wrap ("multi threaded daemon, single client", &test_single_client,
172 NULL, 172 NULL,
173 MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD, 173 MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD,
174 aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, 174 aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
175 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 175 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
176 srv_self_signed_cert_pem, MHD_OPTION_END); 176 srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
178 errorCount += 178 errorCount +=
179 test_wrap ("multi threaded daemon, parallel client", 179 test_wrap ("multi threaded daemon, parallel client",
180 &test_parallel_clients, NULL, 180 &test_parallel_clients, NULL,
181 MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD, 181 MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD,
182 aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY, 182 aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
183 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 183 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
184 srv_self_signed_cert_pem, MHD_OPTION_END); 184 srv_self_signed_cert_pem, MHD_OPTION_END);
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 6dab6072..96c1e17e 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -100,7 +100,7 @@ testExternalGet (int flags)
100 cbc.buf = buf; 100 cbc.buf = buf;
101 cbc.size = 2048; 101 cbc.size = 2048;
102 cbc.pos = 0; 102 cbc.pos = 0;
103 d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | flags, 103 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags,
104 1082, NULL, NULL, &ahc_echo, "GET", 104 1082, NULL, NULL, &ahc_echo, "GET",
105 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 105 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
106 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 106 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c
index 672eac51..b7f541b6 100644
--- a/src/testcurl/https/test_https_multi_daemon.c
+++ b/src/testcurl/https/test_https_multi_daemon.c
@@ -51,7 +51,7 @@ test_concurent_daemon_pair (void *cls,
51 struct MHD_Daemon *d2; 51 struct MHD_Daemon *d2;
52 52
53 d1 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 53 d1 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
54 MHD_USE_DEBUG, DEAMON_TEST_PORT, 54 MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
55 NULL, NULL, &http_ahc, NULL, 55 NULL, NULL, &http_ahc, NULL,
56 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 56 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
57 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 57 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -64,7 +64,7 @@ test_concurent_daemon_pair (void *cls,
64 } 64 }
65 65
66 d2 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 66 d2 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
67 MHD_USE_DEBUG, DEAMON_TEST_PORT + 1, 67 MHD_USE_ERROR_LOG, DEAMON_TEST_PORT + 1,
68 NULL, NULL, &http_ahc, NULL, 68 NULL, NULL, &http_ahc, NULL,
69 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 69 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
70 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 70 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index 2c020dd7..62a01518 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -108,7 +108,7 @@ test_query_session ()
108 108
109 /* setup test */ 109 /* setup test */
110 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 110 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
111 MHD_USE_DEBUG, DEAMON_TEST_PORT, 111 MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
112 NULL, NULL, &query_session_ahc, NULL, 112 NULL, NULL, &query_session_ahc, NULL,
113 MHD_OPTION_HTTPS_PRIORITIES, "NORMAL:+ARCFOUR-128", 113 MHD_OPTION_HTTPS_PRIORITIES, "NORMAL:+ARCFOUR-128",
114 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 114 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
diff --git a/src/testcurl/https/test_https_sni.c b/src/testcurl/https/test_https_sni.c
index 1da1ce3b..137c6a37 100644
--- a/src/testcurl/https/test_https_sni.c
+++ b/src/testcurl/https/test_https_sni.c
@@ -260,7 +260,7 @@ main (int argc, char *const *argv)
260 } 260 }
261 load_keys ("host1", ABS_SRCDIR "/host1.crt", ABS_SRCDIR "/host1.key"); 261 load_keys ("host1", ABS_SRCDIR "/host1.crt", ABS_SRCDIR "/host1.key");
262 load_keys ("host2", ABS_SRCDIR "/host2.crt", ABS_SRCDIR "/host2.key"); 262 load_keys ("host2", ABS_SRCDIR "/host2.crt", ABS_SRCDIR "/host2.key");
263 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG, 263 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG,
264 4233, 264 4233,
265 NULL, NULL, 265 NULL, NULL,
266 &http_ahc, NULL, 266 &http_ahc, NULL,
diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c
index fccbd8ce..3d76b2b6 100644
--- a/src/testcurl/https/test_https_time_out.c
+++ b/src/testcurl/https/test_https_time_out.c
@@ -117,7 +117,7 @@ main (int argc, char *const *argv)
117 gnutls_global_set_log_level (11); 117 gnutls_global_set_log_level (11);
118 118
119 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 119 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
120 MHD_USE_DEBUG, DEAMON_TEST_PORT, 120 MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
121 NULL, NULL, &http_dummy_ahc, NULL, 121 NULL, NULL, &http_dummy_ahc, NULL,
122 MHD_OPTION_CONNECTION_TIMEOUT, TIME_OUT, 122 MHD_OPTION_CONNECTION_TIMEOUT, TIME_OUT,
123 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 123 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c
index 4caa55ba..b5fe8f28 100644
--- a/src/testcurl/https/test_tls_authentication.c
+++ b/src/testcurl/https/test_tls_authentication.c
@@ -50,7 +50,7 @@ test_secure_get (void * cls, char *cipher_suite, int proto_version)
50 struct MHD_Daemon *d; 50 struct MHD_Daemon *d;
51 51
52 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 52 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
53 MHD_USE_DEBUG, DEAMON_TEST_PORT, 53 MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
54 NULL, NULL, &http_ahc, NULL, 54 NULL, NULL, &http_ahc, NULL,
55 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, 55 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
56 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, 56 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
diff --git a/src/testcurl/https/test_tls_extensions.c b/src/testcurl/https/test_tls_extensions.c
index 365dd762..ae680d17 100644
--- a/src/testcurl/https/test_tls_extensions.c
+++ b/src/testcurl/https/test_tls_extensions.c
@@ -232,7 +232,7 @@ main (int argc, char *const *argv)
232 } 232 }
233 233
234 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 234 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
235 MHD_USE_DEBUG, DEAMON_TEST_PORT, 235 MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
236 NULL, NULL, &http_ahc, NULL, 236 NULL, NULL, &http_ahc, NULL,
237 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 237 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
238 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 238 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c
index bd843857..3aa8dc0f 100644
--- a/src/testcurl/https/test_tls_options.c
+++ b/src/testcurl/https/test_tls_options.c
@@ -83,7 +83,7 @@ main (int argc, char *const *argv)
83 unsigned int errorCount = 0; 83 unsigned int errorCount = 0;
84 const char *ssl_version; 84 const char *ssl_version;
85 int daemon_flags = 85 int daemon_flags =
86 MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG; 86 MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG;
87 87
88 gcry_control (GCRYCTL_DISABLE_SECMEM, 0); 88 gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
89 gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); 89 gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index af9758bf..d8d12876 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 195 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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;
@@ -252,7 +252,7 @@ testMultithreadedGet (int port, int poll_flag)
252 252
253 cbc.buf = buf; 253 cbc.buf = buf;
254 cbc.size = 2048; 254 cbc.size = 2048;
255 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 255 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
256 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 256 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
257 if (d == NULL) 257 if (d == NULL)
258 return 16; 258 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 314 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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)
@@ -386,7 +386,7 @@ testExternalGet (int port)
386 multi = NULL; 386 multi = NULL;
387 cbc.buf = buf; 387 cbc.buf = buf;
388 cbc.size = 2048; 388 cbc.size = 2048;
389 d = MHD_start_daemon (MHD_USE_DEBUG, 389 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
390 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 390 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
391 if (d == NULL) 391 if (d == NULL)
392 return 256; 392 return 256;
diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c
index 7bc59b5c..043be1c4 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 239 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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;
@@ -262,7 +262,7 @@ testMultithreadedGet (int port, int poll_flag)
262 const char * const test_desc = poll_flag ? "thread with poll" : "thread with select"; 262 const char * const test_desc = poll_flag ? "thread with poll" : "thread with select";
263 const char * ret_val; 263 const char * ret_val;
264 264
265 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 265 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
266 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 266 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
267 if (d == NULL) 267 if (d == NULL)
268 return 16; 268 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 290 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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)
@@ -321,7 +321,7 @@ testExternalGet (int port)
321 char *ret_val; 321 char *ret_val;
322 int ret = 0; 322 int ret = 0;
323 323
324 d = MHD_start_daemon (MHD_USE_DEBUG, 324 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
325 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 325 port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
326 if (d == NULL) 326 if (d == NULL)
327 return 256; 327 return 256;
diff --git a/src/testcurl/test_concurrent_stop.c b/src/testcurl/test_concurrent_stop.c
index e3759ded..61408960 100644
--- a/src/testcurl/test_concurrent_stop.c
+++ b/src/testcurl/test_concurrent_stop.c
@@ -210,7 +210,7 @@ testMultithreadedGet (int port,
210 struct MHD_Daemon *d; 210 struct MHD_Daemon *d;
211 pthread_t p; 211 pthread_t p;
212 212
213 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 213 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
214 port, 214 port,
215 NULL, NULL, 215 NULL, NULL,
216 &ahc_echo, "GET", 216 &ahc_echo, "GET",
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 235 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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 318bc643..fc0b1889 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 134 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -189,7 +189,7 @@ testMultithreadedDelete ()
189 cbc.buf = buf; 189 cbc.buf = buf;
190 cbc.size = 2048; 190 cbc.size = 2048;
191 cbc.pos = 0; 191 cbc.pos = 0;
192 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 192 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
193 1081, 193 1081,
194 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 194 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
195 if (d == NULL) 195 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 250 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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);
@@ -322,7 +322,7 @@ testExternalDelete ()
322 cbc.buf = buf; 322 cbc.buf = buf;
323 cbc.size = 2048; 323 cbc.size = 2048;
324 cbc.pos = 0; 324 cbc.pos = 0;
325 d = MHD_start_daemon (MHD_USE_DEBUG, 325 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
326 1082, 326 1082,
327 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 327 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
328 if (d == NULL) 328 if (d == NULL)
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 72670842..57abbbe6 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 192 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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 c0c24747..1c4be0d6 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 187 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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 52bf353e..951db10e 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 123 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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;
@@ -170,7 +170,7 @@ testMultithreadedGet (int poll_flag)
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_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 173 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
174 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 174 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
175 if (d == NULL) 175 if (d == NULL)
176 return 16; 176 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 223 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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)
@@ -286,7 +286,7 @@ testExternalGet ()
286 cbc.buf = buf; 286 cbc.buf = buf;
287 cbc.size = 2048; 287 cbc.size = 2048;
288 cbc.pos = 0; 288 cbc.pos = 0;
289 d = MHD_start_daemon (MHD_USE_DEBUG, 289 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
290 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 290 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
291 if (d == NULL) 291 if (d == NULL)
292 return 256; 292 return 256;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 415 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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);
@@ -473,7 +473,7 @@ testStopRace (int poll_flag)
473 MHD_socket fd; 473 MHD_socket fd;
474 struct MHD_Daemon *d; 474 struct MHD_Daemon *d;
475 475
476 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 476 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
477 1081, NULL, NULL, &ahc_echo, "GET", 477 1081, NULL, NULL, &ahc_echo, "GET",
478 MHD_OPTION_CONNECTION_TIMEOUT, 5, MHD_OPTION_END); 478 MHD_OPTION_CONNECTION_TIMEOUT, 5, MHD_OPTION_END);
479 if (d == NULL) 479 if (d == NULL)
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 574 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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 896adf05..9fb94626 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 167 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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;
@@ -206,7 +206,7 @@ testMultithreadedGet ()
206 cbc.buf = buf; 206 cbc.buf = buf;
207 cbc.size = 2048; 207 cbc.size = 2048;
208 cbc.pos = 0; 208 cbc.pos = 0;
209 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 209 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
210 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 210 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
211 if (d == NULL) 211 if (d == NULL)
212 return 16; 212 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 251 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -306,7 +306,7 @@ testExternalGet ()
306 cbc.buf = buf; 306 cbc.buf = buf;
307 cbc.size = 2048; 307 cbc.size = 2048;
308 cbc.pos = 0; 308 cbc.pos = 0;
309 d = MHD_start_daemon (MHD_USE_DEBUG, 309 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
310 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 310 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
311 if (d == NULL) 311 if (d == NULL)
312 return 256; 312 return 256;
diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c
index 5d846c4f..26b2ecda 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 153 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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;
@@ -171,7 +171,7 @@ testMultithreadedGet ()
171 struct MHD_Daemon *d; 171 struct MHD_Daemon *d;
172 pid_t curl; 172 pid_t curl;
173 173
174 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 174 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
175 1081, NULL, NULL, &ahc_echo, "GET", 175 1081, NULL, NULL, &ahc_echo, "GET",
176 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 2, 176 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 2,
177 MHD_OPTION_END); 177 MHD_OPTION_END);
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 210 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -236,7 +236,7 @@ testExternalGet ()
236 struct timeval tv; 236 struct timeval tv;
237 pid_t curl; 237 pid_t curl;
238 238
239 d = MHD_start_daemon (MHD_USE_DEBUG, 239 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
240 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 240 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
241 if (d == NULL) 241 if (d == NULL)
242 return 256; 242 return 256;
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index 70e819dd..a177d213 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 128 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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;
@@ -175,7 +175,7 @@ testMultithreadedGet ()
175 cbc.buf = buf; 175 cbc.buf = buf;
176 cbc.size = 2048; 176 cbc.size = 2048;
177 cbc.pos = 0; 177 cbc.pos = 0;
178 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 178 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
179 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 179 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
180 if (d == NULL) 180 if (d == NULL)
181 return 16; 181 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 228 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -291,7 +291,7 @@ testExternalGet ()
291 cbc.buf = buf; 291 cbc.buf = buf;
292 cbc.size = 2048; 292 cbc.size = 2048;
293 cbc.pos = 0; 293 cbc.pos = 0;
294 d = MHD_start_daemon (MHD_USE_DEBUG, 294 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
295 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 295 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
296 if (d == NULL) 296 if (d == NULL)
297 return 256; 297 return 256;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 420 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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 48536487..a41294ba 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 120 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 211 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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 4ba102bb..df5d824d 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 155 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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),
@@ -210,7 +210,7 @@ testMultithreadedPut ()
210 cbc.buf = buf; 210 cbc.buf = buf;
211 cbc.size = 2048; 211 cbc.size = 2048;
212 cbc.pos = 0; 212 cbc.pos = 0;
213 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 213 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
214 1081, 214 1081,
215 NULL, NULL, &ahc_echo, &done_flag, 215 NULL, NULL, &ahc_echo, &done_flag,
216 MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (1024*1024), 216 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 274 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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,
@@ -348,7 +348,7 @@ testExternalPut ()
348 cbc.size = 2048; 348 cbc.size = 2048;
349 cbc.pos = 0; 349 cbc.pos = 0;
350 multi = NULL; 350 multi = NULL;
351 d = MHD_start_daemon (MHD_USE_DEBUG, 351 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
352 1082, 352 1082,
353 NULL, NULL, &ahc_echo, &done_flag, 353 NULL, NULL, &ahc_echo, &done_flag,
354 MHD_OPTION_CONNECTION_MEMORY_LIMIT, 354 MHD_OPTION_CONNECTION_MEMORY_LIMIT,
diff --git a/src/testcurl/test_long_header.c b/src/testcurl/test_long_header.c
index c26791d0..b2ca1f94 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 104 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 175 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
176 1080, 176 1080,
177 &apc_all, 177 &apc_all,
178 NULL, 178 NULL,
diff --git a/src/testcurl/test_options.c b/src/testcurl/test_options.c
index bb52988e..7b0949a1 100644
--- a/src/testcurl/test_options.c
+++ b/src/testcurl/test_options.c
@@ -90,7 +90,7 @@ test_ip_addr_option ()
90 daemon_ip_addr6.sin6_addr = in6addr_loopback; 90 daemon_ip_addr6.sin6_addr = in6addr_loopback;
91#endif 91#endif
92 92
93 d = MHD_start_daemon (MHD_USE_DEBUG, 4233, 93 d = MHD_start_daemon (MHD_USE_ERROR_LOG, 4233,
94 NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, 94 NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
95 &daemon_ip_addr, MHD_OPTION_END); 95 &daemon_ip_addr, MHD_OPTION_END);
96 96
@@ -100,7 +100,7 @@ test_ip_addr_option ()
100 MHD_stop_daemon (d); 100 MHD_stop_daemon (d);
101 101
102#if HAVE_INET6 102#if HAVE_INET6
103 d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 4233, 103 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_IPv6, 4233,
104 NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, 104 NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
105 &daemon_ip_addr6, MHD_OPTION_END); 105 &daemon_ip_addr6, MHD_OPTION_END);
106 106
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c
index e953cde0..f2a3647d 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -131,7 +131,7 @@ testExternalGet ()
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_DEBUG, 134 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
135 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 135 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
136 if (d == NULL) 136 if (d == NULL)
137 return 256; 137 return 256;
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index 2bb19e3b..cb9ded6e 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 173 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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);
@@ -224,7 +224,7 @@ testMultithreadedPost ()
224 cbc.buf = buf; 224 cbc.buf = buf;
225 cbc.size = 2048; 225 cbc.size = 2048;
226 cbc.pos = 0; 226 cbc.pos = 0;
227 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 227 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
228 1081, NULL, NULL, &ahc_echo, NULL, 228 1081, NULL, NULL, &ahc_echo, NULL,
229 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 229 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
230 MHD_OPTION_END); 230 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 281 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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,
@@ -348,7 +348,7 @@ testExternalPost ()
348 cbc.buf = buf; 348 cbc.buf = buf;
349 cbc.size = 2048; 349 cbc.size = 2048;
350 cbc.pos = 0; 350 cbc.pos = 0;
351 d = MHD_start_daemon (MHD_USE_DEBUG, 351 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
352 1082, NULL, NULL, &ahc_echo, NULL, 352 1082, NULL, NULL, &ahc_echo, NULL,
353 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 353 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
354 MHD_OPTION_END); 354 MHD_OPTION_END);
@@ -559,7 +559,7 @@ testMultithreadedPostCancelPart(int flags)
559 cbc.buf = buf; 559 cbc.buf = buf;
560 cbc.size = 2048; 560 cbc.size = 2048;
561 cbc.pos = 0; 561 cbc.pos = 0;
562 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 562 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
563 1081, NULL, NULL, &ahc_cancel, NULL, 563 1081, NULL, NULL, &ahc_cancel, NULL,
564 MHD_OPTION_END); 564 MHD_OPTION_END);
565 if (d == NULL) 565 if (d == NULL)
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c
index c4436a07..5495fd5a 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 122 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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;
@@ -183,7 +183,7 @@ testMultithreadedPost ()
183 183
184 cbc.buf = buf; 184 cbc.buf = buf;
185 cbc.size = 2048; 185 cbc.size = 2048;
186 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 186 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
187 1081, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); 187 1081, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
188 if (d == NULL) 188 if (d == NULL)
189 return 16; 189 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 250 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -330,7 +330,7 @@ testExternalPost ()
330 cbc.buf = buf; 330 cbc.buf = buf;
331 cbc.size = 2048; 331 cbc.size = 2048;
332 cbc.pos = 0; 332 cbc.pos = 0;
333 d = MHD_start_daemon (MHD_USE_DEBUG, 333 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
334 1082, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); 334 1082, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
335 if (d == NULL) 335 if (d == NULL)
336 return 256; 336 return 256;
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c
index 1c655041..76b84824 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 186 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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);
@@ -239,7 +239,7 @@ testMultithreadedPost ()
239 cbc.buf = buf; 239 cbc.buf = buf;
240 cbc.size = 2048; 240 cbc.size = 2048;
241 cbc.pos = 0; 241 cbc.pos = 0;
242 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 242 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
243 1081, NULL, NULL, &ahc_echo, NULL, 243 1081, NULL, NULL, &ahc_echo, NULL,
244 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 244 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
245 MHD_OPTION_END); 245 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 298 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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,
@@ -367,7 +367,7 @@ testExternalPost ()
367 cbc.buf = buf; 367 cbc.buf = buf;
368 cbc.size = 2048; 368 cbc.size = 2048;
369 cbc.pos = 0; 369 cbc.pos = 0;
370 d = MHD_start_daemon (MHD_USE_DEBUG, 370 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
371 1082, NULL, NULL, &ahc_echo, NULL, 371 1082, NULL, NULL, &ahc_echo, NULL,
372 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 372 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
373 MHD_OPTION_END); 373 MHD_OPTION_END);
diff --git a/src/testcurl/test_process_arguments.c b/src/testcurl/test_process_arguments.c
index 0af578f8..20556082 100644
--- a/src/testcurl/test_process_arguments.c
+++ b/src/testcurl/test_process_arguments.c
@@ -135,7 +135,7 @@ testExternalGet ()
135 cbc.buf = buf; 135 cbc.buf = buf;
136 cbc.size = 2048; 136 cbc.size = 2048;
137 cbc.pos = 0; 137 cbc.pos = 0;
138 d = MHD_start_daemon (MHD_USE_DEBUG, 138 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
139 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 139 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
140 if (d == NULL) 140 if (d == NULL)
141 return 256; 141 return 256;
diff --git a/src/testcurl/test_process_headers.c b/src/testcurl/test_process_headers.c
index 59cb1a67..9c9c94d7 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 160 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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;
@@ -206,7 +206,7 @@ testMultithreadedGet ()
206 cbc.buf = buf; 206 cbc.buf = buf;
207 cbc.size = 2048; 207 cbc.size = 2048;
208 cbc.pos = 0; 208 cbc.pos = 0;
209 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 209 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
210 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 210 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
211 if (d == NULL) 211 if (d == NULL)
212 return 16; 212 return 16;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 258 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -320,7 +320,7 @@ testExternalGet ()
320 cbc.buf = buf; 320 cbc.buf = buf;
321 cbc.size = 2048; 321 cbc.size = 2048;
322 cbc.pos = 0; 322 cbc.pos = 0;
323 d = MHD_start_daemon (MHD_USE_DEBUG, 323 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
324 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 324 21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
325 if (d == NULL) 325 if (d == NULL)
326 return 256; 326 return 256;
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c
index ef70eeac..54725374 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 134 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -187,7 +187,7 @@ testMultithreadedPut ()
187 cbc.buf = buf; 187 cbc.buf = buf;
188 cbc.size = 2048; 188 cbc.size = 2048;
189 cbc.pos = 0; 189 cbc.pos = 0;
190 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 190 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
191 1081, 191 1081,
192 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 192 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
193 if (d == NULL) 193 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 247 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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);
@@ -318,7 +318,7 @@ testExternalPut ()
318 cbc.buf = buf; 318 cbc.buf = buf;
319 cbc.size = 2048; 319 cbc.size = 2048;
320 cbc.pos = 0; 320 cbc.pos = 0;
321 d = MHD_start_daemon (MHD_USE_DEBUG, 321 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
322 1082, 322 1082,
323 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 323 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
324 if (d == NULL) 324 if (d == NULL)
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c
index db4db9d5..48fef064 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 144 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -197,7 +197,7 @@ testMultithreadedPut ()
197 cbc.buf = buf; 197 cbc.buf = buf;
198 cbc.size = 2048; 198 cbc.size = 2048;
199 cbc.pos = 0; 199 cbc.pos = 0;
200 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 200 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
201 11081, 201 11081,
202 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 202 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
203 if (d == NULL) 203 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 257 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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);
@@ -328,7 +328,7 @@ testExternalPut ()
328 cbc.buf = buf; 328 cbc.buf = buf;
329 cbc.size = 2048; 329 cbc.size = 2048;
330 cbc.pos = 0; 330 cbc.pos = 0;
331 d = MHD_start_daemon (MHD_USE_DEBUG, 331 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
332 11082, 332 11082,
333 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 333 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
334 if (d == NULL) 334 if (d == NULL)
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index b572cfb3..682d866e 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -125,7 +125,7 @@ ServeOneRequest(void *param)
125 125
126 fd = (MHD_socket) (intptr_t) param; 126 fd = (MHD_socket) (intptr_t) param;
127 127
128 d = MHD_start_daemon (MHD_USE_DEBUG, 128 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
129 1082, NULL, NULL, &ahc_echo, "GET", 129 1082, NULL, NULL, &ahc_echo, "GET",
130 MHD_OPTION_LISTEN_SOCKET, fd, 130 MHD_OPTION_LISTEN_SOCKET, fd,
131 MHD_OPTION_NOTIFY_COMPLETED, &request_completed, &done, 131 MHD_OPTION_NOTIFY_COMPLETED, &request_completed, &done,
@@ -204,12 +204,12 @@ testGet (int type, int pool_count, int poll_flag)
204 cbc.size = 2048; 204 cbc.size = 2048;
205 cbc.pos = 0; 205 cbc.pos = 0;
206 if (pool_count > 0) { 206 if (pool_count > 0) {
207 d = MHD_start_daemon (type | MHD_USE_DEBUG | MHD_USE_ITC | poll_flag, 207 d = MHD_start_daemon (type | MHD_USE_ERROR_LOG | MHD_USE_ITC | poll_flag,
208 11080, NULL, NULL, &ahc_echo, "GET", 208 11080, NULL, NULL, &ahc_echo, "GET",
209 MHD_OPTION_THREAD_POOL_SIZE, pool_count, MHD_OPTION_END); 209 MHD_OPTION_THREAD_POOL_SIZE, pool_count, MHD_OPTION_END);
210 210
211 } else { 211 } else {
212 d = MHD_start_daemon (type | MHD_USE_DEBUG | MHD_USE_ITC | poll_flag, 212 d = MHD_start_daemon (type | MHD_USE_ERROR_LOG | MHD_USE_ITC | poll_flag,
213 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 213 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
214 } 214 }
215 if (d == NULL) 215 if (d == NULL)
@@ -346,7 +346,7 @@ testExternalGet ()
346 cbc.buf = buf; 346 cbc.buf = buf;
347 cbc.size = 2048; 347 cbc.size = 2048;
348 cbc.pos = 0; 348 cbc.pos = 0;
349 d = MHD_start_daemon (MHD_USE_DEBUG, 349 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
350 11080, 350 11080,
351 NULL, NULL, 351 NULL, NULL,
352 &ahc_echo, "GET", 352 &ahc_echo, "GET",
diff --git a/src/testcurl/test_start_stop.c b/src/testcurl/test_start_stop.c
index ac89340f..7a4e36e4 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 57 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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;
@@ -67,7 +67,7 @@ testMultithreadedGet (int poll_flag)
67{ 67{
68 struct MHD_Daemon *d; 68 struct MHD_Daemon *d;
69 69
70 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 70 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
71 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 71 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
72 if (d == NULL) 72 if (d == NULL)
73 return 2; 73 return 2;
@@ -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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 83 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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)
@@ -94,7 +94,7 @@ testExternalGet ()
94{ 94{
95 struct MHD_Daemon *d; 95 struct MHD_Daemon *d;
96 96
97 d = MHD_start_daemon (MHD_USE_DEBUG, 97 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
98 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 98 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
99 if (d == NULL) 99 if (d == NULL)
100 return 8; 100 return 8;
diff --git a/src/testcurl/test_termination.c b/src/testcurl/test_termination.c
index 01a58193..fc67c1e2 100644
--- a/src/testcurl/test_termination.c
+++ b/src/testcurl/test_termination.c
@@ -91,7 +91,7 @@ main ()
91{ 91{
92 struct MHD_Daemon *daemon; 92 struct MHD_Daemon *daemon;
93 93
94 daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 94 daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
95 PORT, 95 PORT,
96 NULL, 96 NULL,
97 NULL, connection_handler, NULL, MHD_OPTION_END); 97 NULL, connection_handler, NULL, MHD_OPTION_END);
diff --git a/src/testcurl/test_timeout.c b/src/testcurl/test_timeout.c
index 3d7379d0..6968f000 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 175 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 230 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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 ca74addc..9c1e64a8 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag, 137 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | 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 ea1ace0b..d454769c 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 107 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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;
@@ -148,7 +148,7 @@ testMultithreadedGet ()
148 cbc.buf = buf; 148 cbc.buf = buf;
149 cbc.size = 2048; 149 cbc.size = 2048;
150 cbc.pos = 0; 150 cbc.pos = 0;
151 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 151 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
152 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 152 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
153 if (d == NULL) 153 if (d == NULL)
154 return 16; 154 return 16;
@@ -203,7 +203,7 @@ testExternalGet ()
203 cbc.buf = buf; 203 cbc.buf = buf;
204 cbc.size = 2048; 204 cbc.size = 2048;
205 cbc.pos = 0; 205 cbc.pos = 0;
206 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , 206 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
207 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 207 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
208 if (d == NULL) 208 if (d == NULL)
209 return 256; 209 return 256;
diff --git a/src/testzzuf/test_get_chunked.c b/src/testzzuf/test_get_chunked.c
index 79179c61..8525928b 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 133 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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;
@@ -171,7 +171,7 @@ testMultithreadedGet ()
171 cbc.buf = buf; 171 cbc.buf = buf;
172 cbc.size = 2048; 172 cbc.size = 2048;
173 cbc.pos = 0; 173 cbc.pos = 0;
174 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 174 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
175 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 175 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
176 if (d == NULL) 176 if (d == NULL)
177 return 16; 177 return 16;
@@ -223,7 +223,7 @@ testExternalGet ()
223 cbc.buf = buf; 223 cbc.buf = buf;
224 cbc.size = 2048; 224 cbc.size = 2048;
225 cbc.pos = 0; 225 cbc.pos = 0;
226 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , 226 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
227 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END); 227 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
228 if (d == NULL) 228 if (d == NULL)
229 return 256; 229 return 256;
diff --git a/src/testzzuf/test_long_header.c b/src/testzzuf/test_long_header.c
index f1b05756..0e0fb9e2 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 106 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 168 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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 7d8a2660..d2c9ba85 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 160 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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);
@@ -208,7 +208,7 @@ testMultithreadedPost ()
208 cbc.buf = buf; 208 cbc.buf = buf;
209 cbc.size = 2048; 209 cbc.size = 2048;
210 cbc.pos = 0; 210 cbc.pos = 0;
211 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 211 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
212 11080, NULL, NULL, &ahc_echo, NULL, 212 11080, NULL, NULL, &ahc_echo, NULL,
213 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 213 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
214 MHD_OPTION_END); 214 MHD_OPTION_END);
@@ -271,7 +271,7 @@ testExternalPost ()
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_NO_FLAG /* | MHD_USE_DEBUG */ , 274 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
275 1082, NULL, NULL, &ahc_echo, NULL, 275 1082, NULL, NULL, &ahc_echo, NULL,
276 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 276 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
277 MHD_OPTION_END); 277 MHD_OPTION_END);
diff --git a/src/testzzuf/test_post_form.c b/src/testzzuf/test_post_form.c
index c5e70262..647e31f2 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 179 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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);
@@ -227,7 +227,7 @@ testMultithreadedPost ()
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_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 230 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
231 11080, NULL, NULL, &ahc_echo, NULL, 231 11080, NULL, NULL, &ahc_echo, NULL,
232 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 232 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
233 MHD_OPTION_END); 233 MHD_OPTION_END);
@@ -288,7 +288,7 @@ testExternalPost ()
288 cbc.buf = buf; 288 cbc.buf = buf;
289 cbc.size = 2048; 289 cbc.size = 2048;
290 cbc.pos = 0; 290 cbc.pos = 0;
291 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , 291 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
292 1082, NULL, NULL, &ahc_echo, NULL, 292 1082, NULL, NULL, &ahc_echo, NULL,
293 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL, 293 MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
294 MHD_OPTION_END); 294 MHD_OPTION_END);
diff --git a/src/testzzuf/test_put.c b/src/testzzuf/test_put.c
index 71d72853..85785c35 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 131 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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)
@@ -179,7 +179,7 @@ testMultithreadedPut ()
179 cbc.buf = buf; 179 cbc.buf = buf;
180 cbc.size = 2048; 180 cbc.size = 2048;
181 cbc.pos = 0; 181 cbc.pos = 0;
182 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 182 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
183 11080, 183 11080,
184 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 184 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
185 if (d == NULL) 185 if (d == NULL)
@@ -241,7 +241,7 @@ testExternalPut ()
241 cbc.buf = buf; 241 cbc.buf = buf;
242 cbc.size = 2048; 242 cbc.size = 2048;
243 cbc.pos = 0; 243 cbc.pos = 0;
244 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ , 244 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
245 11080, 245 11080,
246 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 246 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
247 if (d == NULL) 247 if (d == NULL)
diff --git a/src/testzzuf/test_put_chunked.c b/src/testzzuf/test_put_chunked.c
index 22a9e88e..40bc3f80 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_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 137 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
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)
@@ -185,7 +185,7 @@ testMultithreadedPut ()
185 cbc.buf = buf; 185 cbc.buf = buf;
186 cbc.size = 2048; 186 cbc.size = 2048;
187 cbc.pos = 0; 187 cbc.pos = 0;
188 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG, 188 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
189 11081, 189 11081,
190 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 190 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
191 if (d == NULL) 191 if (d == NULL)
@@ -253,7 +253,7 @@ testExternalPut ()
253 cbc.buf = buf; 253 cbc.buf = buf;
254 cbc.size = 2048; 254 cbc.size = 2048;
255 cbc.pos = 0; 255 cbc.pos = 0;
256 d = MHD_start_daemon (MHD_USE_DEBUG, 256 d = MHD_start_daemon (MHD_USE_ERROR_LOG,
257 11082, 257 11082,
258 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 258 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
259 if (d == NULL) 259 if (d == NULL)
diff --git a/src/testzzuf/test_put_large.c b/src/testzzuf/test_put_large.c
index 373ce3fd..432ae712 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_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 145 d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
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)
@@ -194,7 +194,7 @@ testMultithreadedPut ()
194 cbc.buf = buf; 194 cbc.buf = buf;
195 cbc.size = 2048; 195 cbc.size = 2048;
196 cbc.pos = 0; 196 cbc.pos = 0;
197 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ , 197 d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
198 11080, 198 11080,
199 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END); 199 NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
200 if (d == NULL) 200 if (d == NULL)
@@ -257,7 +257,7 @@ testExternalPut ()
257 cbc.size = 2048; 257 cbc.size = 2048;
258 cbc.pos = 0; 258 cbc.pos = 0;
259 multi = NULL; 259 multi = NULL;
260 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */, 260 d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */,
261 11080, 261 11080,
262 NULL, NULL, &ahc_echo, &done_flag, 262 NULL, NULL, &ahc_echo, &done_flag,
263 MHD_OPTION_CONNECTION_MEMORY_LIMIT, 263 MHD_OPTION_CONNECTION_MEMORY_LIMIT,