[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. df
From: |
gitolite |
Subject: |
[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. df98141b03a5c2fec11442f617e8842b6230b793 |
Date: |
Tue, 8 Nov 2016 17:46:08 +0100 (CET) |
The branch, master has been updated
via df98141b03a5c2fec11442f617e8842b6230b793 (commit)
via d5245634c224c7169634ce4c34e800447f426c87 (commit)
via 2636c2090dc7bfceda3cc3541d6ef2133e18de5d (commit)
from c39f9bfb2696e0b7c04c6f4b90ea0ab8b646e064 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit df98141b03a5c2fec11442f617e8842b6230b793
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date: Tue Nov 8 19:44:50 2016 +0300
Added missing MHD_USE_INTERNAL_POLLING_THREAD in examples.
commit d5245634c224c7169634ce4c34e800447f426c87
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date: Tue Nov 8 19:41:28 2016 +0300
Added MHD_USE_ERROR_LOG flag with same value as MHD_USE_DEBUG.
New name better explains flag actions.
commit 2636c2090dc7bfceda3cc3541d6ef2133e18de5d
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date: Tue Nov 8 19:22:02 2016 +0300
Renamed MHD flags: do not print deprecation messages for some time.
-----------------------------------------------------------------------
Summary of changes:
README | 2 +-
doc/examples/sessions.c | 2 +-
doc/libmicrohttpd.texi | 2 +-
src/examples/authorization_example.c | 2 +-
src/examples/chunked_example.c | 8 ++--
src/examples/demo.c | 2 +-
src/examples/demo_https.c | 2 +-
src/examples/digest_auth_example.c | 2 +-
src/examples/dual_stack_example.c | 2 +-
src/examples/fileserver_example.c | 2 +-
src/examples/fileserver_example_dirs.c | 2 +-
src/examples/fileserver_example_external_select.c | 2 +-
src/examples/https_fileserver_example.c | 2 +-
src/examples/minimal_example.c | 8 ++--
src/examples/minimal_example_comet.c | 2 +-
src/examples/post_example.c | 2 +-
src/examples/querystring_example.c | 2 +-
src/examples/refuse_post_example.c | 2 +-
src/examples/timeout.c | 2 +-
src/examples/upgrade_example.c | 2 +-
src/include/microhttpd.h | 43 ++++++++++++++++++----
src/microhttpd/connection.c | 2 +-
src/microhttpd/internal.c | 2 +-
src/microhttpd/test_daemon.c | 10 ++---
src/microhttpd/test_upgrade.c | 4 +-
src/testcurl/https/test_empty_response.c | 2 +-
src/testcurl/https/test_https_get.c | 4 +-
src/testcurl/https/test_https_get_parallel.c | 8 ++--
.../https/test_https_get_parallel_threads.c | 4 +-
src/testcurl/https/test_https_get_select.c | 2 +-
src/testcurl/https/test_https_multi_daemon.c | 4 +-
src/testcurl/https/test_https_session_info.c | 2 +-
src/testcurl/https/test_https_sni.c | 2 +-
src/testcurl/https/test_https_time_out.c | 2 +-
src/testcurl/https/test_tls_authentication.c | 2 +-
src/testcurl/https/test_tls_extensions.c | 2 +-
src/testcurl/https/test_tls_options.c | 2 +-
src/testcurl/perf_get.c | 8 ++--
src/testcurl/perf_get_concurrent.c | 8 ++--
src/testcurl/test_concurrent_stop.c | 4 +-
src/testcurl/test_delete.c | 8 ++--
src/testcurl/test_digestauth.c | 2 +-
src/testcurl/test_digestauth_with_arguments.c | 2 +-
src/testcurl/test_get.c | 14 +++----
src/testcurl/test_get_chunked.c | 8 ++--
src/testcurl/test_get_response_cleanup.c | 8 ++--
src/testcurl/test_get_sendfile.c | 10 ++---
src/testcurl/test_iplimit.c | 4 +-
src/testcurl/test_large_put.c | 8 ++--
src/testcurl/test_long_header.c | 4 +-
src/testcurl/test_options.c | 4 +-
src/testcurl/test_parse_cookies.c | 2 +-
src/testcurl/test_post.c | 10 ++---
src/testcurl/test_post_loop.c | 8 ++--
src/testcurl/test_postform.c | 8 ++--
src/testcurl/test_process_arguments.c | 2 +-
src/testcurl/test_process_headers.c | 8 ++--
src/testcurl/test_put.c | 8 ++--
src/testcurl/test_put_chunked.c | 8 ++--
src/testcurl/test_quiesce.c | 8 ++--
src/testcurl/test_start_stop.c | 8 ++--
src/testcurl/test_termination.c | 2 +-
src/testcurl/test_timeout.c | 4 +-
src/testcurl/test_urlparse.c | 2 +-
src/testzzuf/test_get.c | 6 +--
src/testzzuf/test_get_chunked.c | 6 +--
src/testzzuf/test_long_header.c | 4 +-
src/testzzuf/test_post.c | 6 +--
src/testzzuf/test_post_form.c | 6 +--
src/testzzuf/test_put.c | 6 +--
src/testzzuf/test_put_chunked.c | 6 +--
src/testzzuf/test_put_large.c | 6 +--
72 files changed, 196 insertions(+), 169 deletions(-)
diff --git a/README b/README
index eade3da..6a8d278 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ If you are using Subversion, run "autoreconf -fi" to create
configure.
In order to run the testcases, you need a recent version of libcurl.
libcurl is not required if you just want to install the library.
-Especially for development, do use the MHD_USE_DEBUG option to get
+Especially for development, do use the MHD_USE_ERROR_LOG option to get
error messages.
diff --git a/doc/examples/sessions.c b/doc/examples/sessions.c
index 8b3e1df..be4cf46 100644
--- a/doc/examples/sessions.c
+++ b/doc/examples/sessions.c
@@ -732,7 +732,7 @@ main (int argc, char *const *argv)
}
/* initialize PRNG */
srand ((unsigned int) time (NULL));
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL,
&create_response, NULL,
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index ae26295..0078480 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -882,7 +882,7 @@ and the second a pointer of type 'void*' which will
be passed as the "arg" argument to "fun".
Note that MHD will not generate any log messages without
-the MHD_USE_DEBUG flag set and if MHD was compiled
+the MHD_USE_ERROR_LOG flag set and if MHD was compiled
with the "--disable-messages" flag.
@item MHD_OPTION_THREAD_POOL_SIZE
diff --git a/src/examples/authorization_example.c
b/src/examples/authorization_example.c
index eb47810..d793147 100644
--- a/src/examples/authorization_example.c
+++ b/src/examples/authorization_example.c
@@ -106,7 +106,7 @@ main (int argc, char *const *argv)
return 1;
}
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/examples/chunked_example.c b/src/examples/chunked_example.c
index c9baa5b..83e9c9d 100644
--- a/src/examples/chunked_example.c
+++ b/src/examples/chunked_example.c
@@ -78,10 +78,10 @@ main (int argc, char *const *argv)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
MHD_USE_POLL,
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
- // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG |
MHD_USE_POLL,
- // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL,
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+ // MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL,
+ // MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
diff --git a/src/examples/demo.c b/src/examples/demo.c
index ef2a178..40ffcc2 100644
--- a/src/examples/demo.c
+++ b/src/examples/demo.c
@@ -883,7 +883,7 @@ main (int argc, char *const *argv)
MHD_RESPMEM_PERSISTENT);
mark_as_html (internal_error_response);
update_directory ();
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG
#ifdef EPOLL_SUPPORT
| MHD_USE_EPOLL
#endif
diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c
index ee8643c..f9734de 100644
--- a/src/examples/demo_https.c
+++ b/src/examples/demo_https.c
@@ -932,7 +932,7 @@ main (int argc, char *const *argv)
MHD_RESPMEM_PERSISTENT);
mark_as_html (internal_error_response);
update_directory ();
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
MHD_USE_TLS
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
MHD_USE_TLS
#ifdef EPOLL_SUPPORT
| MHD_USE_EPOLL
#endif
diff --git a/src/examples/digest_auth_example.c
b/src/examples/digest_auth_example.c
index 62c99cf..548d0d9 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)
off += len;
}
(void) close(fd);
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE,
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 04ca3ca..6b3cef8 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)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
MHD_USE_DUAL_STACK,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
MHD_USE_DUAL_STACK,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
diff --git a/src/examples/fileserver_example.c
b/src/examples/fileserver_example.c
index 9637bff..9a46fba 100644
--- a/src/examples/fileserver_example.c
+++ b/src/examples/fileserver_example.c
@@ -129,7 +129,7 @@ main (int argc, char *const *argv)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/examples/fileserver_example_dirs.c
b/src/examples/fileserver_example_dirs.c
index e0a6362..32110aa 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)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
if (NULL == d)
diff --git a/src/examples/fileserver_example_external_select.c
b/src/examples/fileserver_example_external_select.c
index 6f7d83c..1ae79e1 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)
printf ("%s PORT SECONDS-TO-RUN\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/examples/https_fileserver_example.c
b/src/examples/https_fileserver_example.c
index 0b072cf..a36b5f7 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)
/* TODO check if this is truly necessary - disallow usage of the
blocking /dev/random */
/* gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); */
TLS_daemon =
- MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG |
+ MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
MHD_USE_TLS, atoi (argv[1]), NULL, NULL, &http_ahc,
NULL, MHD_OPTION_CONNECTION_TIMEOUT, 256,
MHD_OPTION_HTTPS_MEM_KEY, key_pem,
diff --git a/src/examples/minimal_example.c b/src/examples/minimal_example.c
index a1138f2..8716304 100644
--- a/src/examples/minimal_example.c
+++ b/src/examples/minimal_example.c
@@ -67,10 +67,10 @@ main (int argc, char *const *argv)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
MHD_USE_POLL,
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
- // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG |
MHD_USE_POLL,
- // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (// MHD_USE_INTERNAL_POLLING_THREAD |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL,
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
+ // MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | MHD_USE_POLL,
+ // MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 120,
diff --git a/src/examples/minimal_example_comet.c
b/src/examples/minimal_example_comet.c
index 0c9d264..de1a10a 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)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/examples/post_example.c b/src/examples/post_example.c
index d0872cc..2d83e0a 100644
--- a/src/examples/post_example.c
+++ b/src/examples/post_example.c
@@ -715,7 +715,7 @@ main (int argc, char *const *argv)
}
/* initialize PRNG */
srand ((unsigned int) time (NULL));
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL,
&create_response, NULL,
diff --git a/src/examples/querystring_example.c
b/src/examples/querystring_example.c
index 24f8ae4..6f95b44 100644
--- a/src/examples/querystring_example.c
+++ b/src/examples/querystring_example.c
@@ -79,7 +79,7 @@ main (int argc, char *const *argv)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/examples/refuse_post_example.c
b/src/examples/refuse_post_example.c
index 846546c..8079f46 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)
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL, &ahc_echo, (void *) askpage,
MHD_OPTION_END);
diff --git a/src/examples/timeout.c b/src/examples/timeout.c
index 5025d26..ef18c0e 100644
--- a/src/examples/timeout.c
+++ b/src/examples/timeout.c
@@ -38,7 +38,7 @@ main (int argc,
{
struct MHD_Daemon *daemon;
- daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION,
+ daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD,
PORT,
NULL, NULL,
&answer_to_connection, NULL,
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c
index c03755f..dcb20fc 100644
--- a/src/examples/upgrade_example.c
+++ b/src/examples/upgrade_example.c
@@ -275,7 +275,7 @@ main (int argc,
printf ("%s PORT\n", argv[0]);
return 1;
}
- d = MHD_start_daemon (MHD_ALLOW_UPGRADE | MHD_USE_INTERNAL_POLLING_THREAD |
MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_ALLOW_UPGRADE | MHD_USE_INTERNAL_POLLING_THREAD |
MHD_USE_ERROR_LOG,
atoi (argv[1]),
NULL, NULL,
&ahc_echo, NULL,
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 4a8c814..0f3e487 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -533,6 +533,13 @@ enum MHD_FLAG
MHD_NO_FLAG = 0,
/**
+ * Print errors messages to custom error logger or to `stderr` if
+ * custom error logger is not set.
+ * @sa ::MHD_OPTION_EXTERNAL_LOGGER
+ */
+ MHD_USE_ERROR_LOG = 1,
+
+ /**
* Run in debug mode. If this flag is used, the library should
* print error messages and warnings to `stderr`.
*/
@@ -542,11 +549,11 @@ enum MHD_FLAG
* Run in HTTPS mode. The modern protocol is called TLS.
*/
MHD_USE_TLS = 2,
- MHD_USE_SSL = 2,
+ /** @deprecated */
+ MHD_USE_SSL = 2,
#if 0
/* let's do this later once versions that define MHD_USE_TLS a more widely
deployed. */
- /** @deprecated */
#define MHD_USE_SSL \
_MHD_DEPR_IN_MACRO("Value MHD_USE_SSL is deprecated, use MHD_USE_TLS") \
MHD_USE_TLS
@@ -571,9 +578,11 @@ enum MHD_FLAG
/** @deprecated */
MHD_USE_SELECT_INTERNALLY = 8,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_USE_SELECT_INTERNALLY \
_MHD_DEPR_IN_MACRO("Value MHD_USE_SELECT_INTERNALLY is deprecated, use
MHD_USE_INTERNAL_POLLING_THREAD instead") \
MHD_USE_INTERNAL_POLLING_THREAD
+#endif /* 0 */
/**
* Run using the IPv6 protocol (otherwise, MHD will just support
@@ -613,9 +622,11 @@ enum MHD_FLAG
/** @deprecated */
MHD_USE_POLL_INTERNALLY = MHD_USE_POLL | MHD_USE_INTERNAL_POLLING_THREAD,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_USE_POLL_INTERNALLY \
_MHD_DEPR_IN_MACRO("Value MHD_USE_POLL_INTERNALLY is deprecated, use
MHD_USE_POLL_INTERNAL_THREAD instead") \
MHD_USE_POLL_INTERNAL_THREAD
+#endif /* 0 */
/**
* Suppress (automatically) adding the 'Date:' header to HTTP responses.
@@ -625,10 +636,13 @@ enum MHD_FLAG
*/
MHD_USE_SUPPRESS_DATE_NO_CLOCK = 128,
-/** @deprecated */
+ /** @deprecated */
+ MHD_SUPPRESS_DATE_NO_CLOCK = 128,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_SUPPRESS_DATE_NO_CLOCK \
_MHD_DEPR_IN_MACRO("Value MHD_SUPPRESS_DATE_NO_CLOCK is deprecated, use
MHD_USE_SUPPRESS_DATE_NO_CLOCK instead") \
MHD_USE_SUPPRESS_DATE_NO_CLOCK
+#endif /* 0 */
/**
* Run without a listen socket. This option only makes sense if
@@ -648,10 +662,13 @@ enum MHD_FLAG
*/
MHD_USE_EPOLL = 512,
-/** @deprecated */
+ /** @deprecated */
+ MHD_USE_EPOLL_LINUX_ONLY = 512,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_USE_EPOLL_LINUX_ONLY \
_MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_LINUX_ONLY is deprecated, use
MHD_USE_EPOLL") \
MHD_USE_EPOLL
+#endif /* 0 */
/**
* Run using an internal thread (or thread pool) doing `epoll()`.
@@ -661,15 +678,19 @@ enum MHD_FLAG
*/
MHD_USE_EPOLL_INTERNAL_THREAD = MHD_USE_EPOLL |
MHD_USE_INTERNAL_POLLING_THREAD,
-/** @deprecated */
+ /** @deprecated */
MHD_USE_EPOLL_INTERNALLY = MHD_USE_EPOLL | MHD_USE_INTERNAL_POLLING_THREAD,
+ /** @deprecated */
+ MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY = MHD_USE_EPOLL |
MHD_USE_INTERNAL_POLLING_THREAD,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_USE_EPOLL_INTERNALLY \
_MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_INTERNALLY is deprecated, use
MHD_USE_EPOLL_INTERNAL_THREAD") \
MHD_USE_EPOLL_INTERNAL_THREAD
-/** @deprecated */
+ /** @deprecated */
#define MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY \
_MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY is deprecated,
use MHD_USE_EPOLL_INTERNAL_THREAD") \
MHD_USE_EPOLL_INTERNAL_THREAD
+#endif /* 0 */
/**
* Use inter-thread communication channel.
@@ -685,10 +706,13 @@ enum MHD_FLAG
*/
MHD_USE_ITC = 1024,
-/** @deprecated */
+ /** @deprecated */
+ MHD_USE_PIPE_FOR_SHUTDOWN = 1024,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_USE_PIPE_FOR_SHUTDOWN \
_MHD_DEPR_IN_MACRO("Value MHD_USE_PIPE_FOR_SHUTDOWN is deprecated, use
MHD_USE_ITC") \
MHD_USE_ITC
+#endif /* 0 */
/**
* Use a single socket for IPv4 and IPv6.
@@ -708,10 +732,13 @@ enum MHD_FLAG
*/
MHD_ALLOW_SUSPEND_RESUME = 8192 | MHD_USE_ITC,
-/** @deprecated */
+ /** @deprecated */
+ MHD_USE_SUSPEND_RESUME = 8192 | MHD_USE_ITC,
+#if 0 /* Will be marked for real deprecation later. */
#define MHD_USE_SUSPEND_RESUME \
_MHD_DEPR_IN_MACRO("Value MHD_USE_SUSPEND_RESUME is deprecated, use
MHD_ALLOW_SUSPEND_RESUME instead") \
MHD_ALLOW_SUSPEND_RESUME
+#endif /* 0 */
/**
* Enable TCP_FASTOPEN option. This option is only available on Linux with a
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index f256cb8..3b9b0ce 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3290,7 +3290,7 @@ MHD_connection_epoll_update_ (struct MHD_Connection
*connection)
&event))
{
#ifdef HAVE_MESSAGES
- if (0 != (daemon->options & MHD_USE_DEBUG))
+ if (0 != (daemon->options & MHD_USE_ERROR_LOG))
MHD_DLOG (daemon,
_("Call to epoll_ctl failed: %s\n"),
MHD_socket_last_strerr_ ());
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index aa5a359..966f562 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -99,7 +99,7 @@ MHD_DLOG (const struct MHD_Daemon *daemon,
{
va_list va;
- if (0 == (daemon->options & MHD_USE_DEBUG))
+ if (0 == (daemon->options & MHD_USE_ERROR_LOG))
return;
va_start (va, format);
daemon->custom_error_log (daemon->custom_error_log_cls,
diff --git a/src/microhttpd/test_daemon.c b/src/microhttpd/test_daemon.c
index 4692085..169ebb6 100644
--- a/src/microhttpd/test_daemon.c
+++ b/src/microhttpd/test_daemon.c
@@ -40,7 +40,7 @@ testStartError ()
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_DEBUG, 0, NULL, NULL, NULL, NULL);
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG, 0, NULL, NULL, NULL, NULL);
if (d != NULL)
return 1;
return 0;
@@ -75,7 +75,7 @@ testStartStop ()
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080,
&apc_nothing,
NULL, &ahc_nothing, NULL, MHD_OPTION_END);
@@ -93,7 +93,7 @@ testExternalRun ()
MHD_socket maxfd;
int i;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1081,
&apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END);
@@ -124,7 +124,7 @@ static int
testThread ()
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_INTERNAL_POLLING_THREAD,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_INTERNAL_POLLING_THREAD,
1082,
&apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END);
@@ -140,7 +140,7 @@ static int
testMultithread ()
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION,
1083,
&apc_all, NULL, &ahc_nothing, NULL, MHD_OPTION_END);
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index b28519d..b74bdc0 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -1004,7 +1004,7 @@ test_upgrade (int flags,
done = 0;
if (!test_tls)
- d = MHD_start_daemon (flags | MHD_USE_DEBUG | MHD_ALLOW_UPGRADE,
+ d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE,
1080,
NULL, NULL,
&ahc_upgrade, NULL,
@@ -1015,7 +1015,7 @@ test_upgrade (int flags,
MHD_OPTION_END);
#ifdef HTTPS_SUPPORT
else
- d = MHD_start_daemon (flags | MHD_USE_DEBUG | MHD_ALLOW_UPGRADE |
MHD_USE_TLS,
+ d = MHD_start_daemon (flags | MHD_USE_ERROR_LOG | MHD_ALLOW_UPGRADE |
MHD_USE_TLS,
1080,
NULL, NULL,
&ahc_upgrade, NULL,
diff --git a/src/testcurl/https/test_empty_response.c
b/src/testcurl/https/test_empty_response.c
index dbc0564..2acc820 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -80,7 +80,7 @@ testInternalSelectGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS |
MHD_USE_INTERNAL_POLLING_THREAD,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS |
MHD_USE_INTERNAL_POLLING_THREAD,
1082, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
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 9882fc5..f5b47e6 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,
int ret;
struct MHD_Daemon *d;
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, 4233,
+ MHD_USE_ERROR_LOG, 4233,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -76,7 +76,7 @@ test_secure_get (FILE * test_fd,
struct MHD_Daemon *d;
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, 4233,
+ MHD_USE_ERROR_LOG, 4233,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
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 4b33e01..d9d6eef 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)
errorCount +=
test_wrap ("single threaded daemon, single client, epoll",
&test_single_client,
NULL,
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG |
MHD_USE_EPOLL,
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -159,7 +159,7 @@ main (int argc, char *const *argv)
errorCount +=
test_wrap ("single threaded daemon, single client", &test_single_client,
NULL,
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG,
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
MHD_USE_ERROR_LOG,
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -167,7 +167,7 @@ main (int argc, char *const *argv)
errorCount +=
test_wrap ("single threaded daemon, parallel clients, epoll",
&test_parallel_clients, NULL,
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG |
MHD_USE_EPOLL,
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -175,7 +175,7 @@ main (int argc, char *const *argv)
errorCount +=
test_wrap ("single threaded daemon, parallel clients",
&test_parallel_clients, NULL,
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG,
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
MHD_USE_ERROR_LOG,
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
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 d057e79..ef1ecf6 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)
errorCount +=
test_wrap ("multi threaded daemon, single client", &test_single_client,
NULL,
- MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD,
+ MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
| MHD_USE_INTERNAL_POLLING_THREAD,
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
errorCount +=
test_wrap ("multi threaded daemon, parallel client",
&test_parallel_clients, NULL,
- MHD_USE_TLS | MHD_USE_DEBUG | MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD,
+ MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
| MHD_USE_INTERNAL_POLLING_THREAD,
aes256_sha, CURL_SSLVERSION_TLSv1, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
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 6dab607..96c1e17 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)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | flags,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags,
1082, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
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 672eac5..b7f541b 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,
struct MHD_Daemon *d2;
d1 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, DEAMON_TEST_PORT,
+ MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -64,7 +64,7 @@ test_concurent_daemon_pair (void *cls,
}
d2 = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, DEAMON_TEST_PORT + 1,
+ MHD_USE_ERROR_LOG, DEAMON_TEST_PORT + 1,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
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 2c020dd..62a0151 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 ()
/* setup test */
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, DEAMON_TEST_PORT,
+ MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
NULL, NULL, &query_session_ahc, NULL,
MHD_OPTION_HTTPS_PRIORITIES, "NORMAL:+ARCFOUR-128",
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 1da1ce3..137c6a3 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)
}
load_keys ("host1", ABS_SRCDIR "/host1.crt", ABS_SRCDIR "/host1.key");
load_keys ("host2", ABS_SRCDIR "/host2.crt", ABS_SRCDIR "/host2.key");
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | MHD_USE_ERROR_LOG,
4233,
NULL, NULL,
&http_ahc, NULL,
diff --git a/src/testcurl/https/test_https_time_out.c
b/src/testcurl/https/test_https_time_out.c
index fccbd8c..3d76b2b 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)
gnutls_global_set_log_level (11);
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, DEAMON_TEST_PORT,
+ MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
NULL, NULL, &http_dummy_ahc, NULL,
MHD_OPTION_CONNECTION_TIMEOUT, TIME_OUT,
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 4caa55b..b5fe8f2 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)
struct MHD_Daemon *d;
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, DEAMON_TEST_PORT,
+ MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
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 365dd76..ae680d1 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)
}
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
- MHD_USE_DEBUG, DEAMON_TEST_PORT,
+ MHD_USE_ERROR_LOG, DEAMON_TEST_PORT,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
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 bd84385..3aa8dc0 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)
unsigned int errorCount = 0;
const char *ssl_version;
int daemon_flags =
- MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD |
MHD_USE_TLS | MHD_USE_DEBUG;
+ MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD |
MHD_USE_TLS | MHD_USE_ERROR_LOG;
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index af9758b..d8d1287 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -192,7 +192,7 @@ testInternalGet (int port, int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -252,7 +252,7 @@ testMultithreadedGet (int port, int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -311,7 +311,7 @@ testMultithreadedPoolGet (int port, int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
port, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -386,7 +386,7 @@ testExternalGet (int port)
multi = NULL;
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/perf_get_concurrent.c
b/src/testcurl/perf_get_concurrent.c
index 7bc59b5..043be1c 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)
const char * const test_desc = poll_flag ? "internal poll" : "internal
select";
const char * ret_val;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -262,7 +262,7 @@ testMultithreadedGet (int port, int poll_flag)
const char * const test_desc = poll_flag ? "thread with poll" : "thread with
select";
const char * ret_val;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -287,7 +287,7 @@ testMultithreadedPoolGet (int port, int poll_flag)
const char * const test_desc = poll_flag ? "thread pool with poll" : "thread
pool with select";
const char * ret_val;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
port, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -321,7 +321,7 @@ testExternalGet (int port)
char *ret_val;
int ret = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
port, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_concurrent_stop.c
b/src/testcurl/test_concurrent_stop.c
index e3759de..6140896 100644
--- a/src/testcurl/test_concurrent_stop.c
+++ b/src/testcurl/test_concurrent_stop.c
@@ -210,7 +210,7 @@ testMultithreadedGet (int port,
struct MHD_Daemon *d;
pthread_t p;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
port,
NULL, NULL,
&ahc_echo, "GET",
@@ -232,7 +232,7 @@ testMultithreadedPoolGet (int port,
struct MHD_Daemon *d;
pthread_t p;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
port,
NULL, NULL,
&ahc_echo, "GET",
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c
index 318bc64..fc0b188 100644
--- a/src/testcurl/test_delete.c
+++ b/src/testcurl/test_delete.c
@@ -131,7 +131,7 @@ testInternalDelete ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -189,7 +189,7 @@ testMultithreadedDelete ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -247,7 +247,7 @@ testMultithreadedPoolDelete ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
@@ -322,7 +322,7 @@ testExternalDelete ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 7267084..57abbbe 100644
--- a/src/testcurl/test_digestauth.c
+++ b/src/testcurl/test_digestauth.c
@@ -189,7 +189,7 @@ testDigestAuth ()
return 1;
}
#endif
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1337, NULL, NULL, &ahc_echo, PAGE,
MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd,
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 c0c2474..1c4be0d 100644
--- a/src/testcurl/test_digestauth_with_arguments.c
+++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -184,7 +184,7 @@ testDigestAuth ()
return 1;
}
#endif
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1337, NULL, NULL, &ahc_echo, PAGE,
MHD_OPTION_DIGEST_AUTH_RANDOM, sizeof (rnd), rnd,
MHD_OPTION_NONCE_NC_SIZE, 300,
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index 52bf353..951db10 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -120,7 +120,7 @@ testInternalGet (int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -170,7 +170,7 @@ testMultithreadedGet (int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -220,7 +220,7 @@ testMultithreadedPoolGet (int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -286,7 +286,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
@@ -412,7 +412,7 @@ testUnknownPortGet (int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
1, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_SOCK_ADDR, &addr,
MHD_OPTION_END);
@@ -473,7 +473,7 @@ testStopRace (int poll_flag)
MHD_socket fd;
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_CONNECTION_TIMEOUT, 5, MHD_OPTION_END);
if (d == NULL)
@@ -571,7 +571,7 @@ testEmptyGet (int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
11081, NULL, NULL, &ahc_empty, NULL, MHD_OPTION_END);
if (d == NULL)
return 4194304;
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c
index 896adf0..9fb9462 100644
--- a/src/testcurl/test_get_chunked.c
+++ b/src/testcurl/test_get_chunked.c
@@ -164,7 +164,7 @@ testInternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -206,7 +206,7 @@ testMultithreadedGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -248,7 +248,7 @@ testMultithreadedPoolGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -306,7 +306,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_get_response_cleanup.c
b/src/testcurl/test_get_response_cleanup.c
index 5d846c4..26b2ecd 100644
--- a/src/testcurl/test_get_response_cleanup.c
+++ b/src/testcurl/test_get_response_cleanup.c
@@ -150,7 +150,7 @@ testInternalGet ()
pid_t curl;
ok = 1;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -171,7 +171,7 @@ testMultithreadedGet ()
struct MHD_Daemon *d;
pid_t curl;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 2,
MHD_OPTION_END);
@@ -207,7 +207,7 @@ testMultithreadedPoolGet ()
struct MHD_Daemon *d;
pid_t curl;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -236,7 +236,7 @@ testExternalGet ()
struct timeval tv;
pid_t curl;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index 70e819d..a177d21 100644
--- a/src/testcurl/test_get_sendfile.c
+++ b/src/testcurl/test_get_sendfile.c
@@ -125,7 +125,7 @@ testInternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -175,7 +175,7 @@ testMultithreadedGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -225,7 +225,7 @@ testMultithreadedPoolGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -291,7 +291,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
@@ -417,7 +417,7 @@ testUnknownPortGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_SOCK_ADDR, &addr,
MHD_OPTION_END);
diff --git a/src/testcurl/test_iplimit.c b/src/testcurl/test_iplimit.c
index 4853648..a41294b 100644
--- a/src/testcurl/test_iplimit.c
+++ b/src/testcurl/test_iplimit.c
@@ -117,7 +117,7 @@ testMultithreadedGet ()
if (!oneone)
return 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL,
&ahc_echo, "GET",
MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2,
@@ -208,7 +208,7 @@ testMultithreadedPoolGet ()
if (!oneone)
return 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_PER_IP_CONNECTION_LIMIT, 2,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index 4ba102b..df5d824 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -152,7 +152,7 @@ testInternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t)
(1024*1024),
@@ -210,7 +210,7 @@ testMultithreadedPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t)
(1024*1024),
@@ -271,7 +271,7 @@ testMultithreadedPoolPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
@@ -348,7 +348,7 @@ testExternalPut ()
cbc.size = 2048;
cbc.pos = 0;
multi = NULL;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
diff --git a/src/testcurl/test_long_header.c b/src/testcurl/test_long_header.c
index c26791d..b2ca1f9 100644
--- a/src/testcurl/test_long_header.c
+++ b/src/testcurl/test_long_header.c
@@ -101,7 +101,7 @@ testLongUrlGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
1080,
&apc_all,
NULL,
@@ -172,7 +172,7 @@ testLongHeaderGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
1080,
&apc_all,
NULL,
diff --git a/src/testcurl/test_options.c b/src/testcurl/test_options.c
index bb52988..7b0949a 100644
--- a/src/testcurl/test_options.c
+++ b/src/testcurl/test_options.c
@@ -90,7 +90,7 @@ test_ip_addr_option ()
daemon_ip_addr6.sin6_addr = in6addr_loopback;
#endif
- d = MHD_start_daemon (MHD_USE_DEBUG, 4233,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG, 4233,
NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
&daemon_ip_addr, MHD_OPTION_END);
@@ -100,7 +100,7 @@ test_ip_addr_option ()
MHD_stop_daemon (d);
#if HAVE_INET6
- d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 4233,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_IPv6, 4233,
NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
&daemon_ip_addr6, MHD_OPTION_END);
diff --git a/src/testcurl/test_parse_cookies.c
b/src/testcurl/test_parse_cookies.c
index e953cde..f2a3647 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -131,7 +131,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index 2bb19e3..cb9ded6 100644
--- a/src/testcurl/test_post.c
+++ b/src/testcurl/test_post.c
@@ -170,7 +170,7 @@ testInternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -224,7 +224,7 @@ testMultithreadedPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -278,7 +278,7 @@ testMultithreadedPoolPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
@@ -348,7 +348,7 @@ testExternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -559,7 +559,7 @@ testMultithreadedPostCancelPart(int flags)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_cancel, NULL,
MHD_OPTION_END);
if (d == NULL)
diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c
index c4436a0..5495fd5 100644
--- a/src/testcurl/test_post_loop.c
+++ b/src/testcurl/test_post_loop.c
@@ -119,7 +119,7 @@ testInternalPost ()
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -183,7 +183,7 @@ testMultithreadedPost ()
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -247,7 +247,7 @@ testMultithreadedPoolPost ()
cbc.buf = buf;
cbc.size = 2048;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -330,7 +330,7 @@ testExternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c
index 1c65504..76b8482 100644
--- a/src/testcurl/test_postform.c
+++ b/src/testcurl/test_postform.c
@@ -183,7 +183,7 @@ testInternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -239,7 +239,7 @@ testMultithreadedPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -295,7 +295,7 @@ testMultithreadedPoolPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
@@ -367,7 +367,7 @@ testExternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
diff --git a/src/testcurl/test_process_arguments.c
b/src/testcurl/test_process_arguments.c
index 0af578f..2055608 100644
--- a/src/testcurl/test_process_arguments.c
+++ b/src/testcurl/test_process_arguments.c
@@ -135,7 +135,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_process_headers.c
b/src/testcurl/test_process_headers.c
index 59cb1a6..9c9c94d 100644
--- a/src/testcurl/test_process_headers.c
+++ b/src/testcurl/test_process_headers.c
@@ -157,7 +157,7 @@ testInternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -206,7 +206,7 @@ testMultithreadedGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -255,7 +255,7 @@ testMultithreadedPoolGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
21080, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -320,7 +320,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
21080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c
index ef70eea..5472537 100644
--- a/src/testcurl/test_put.c
+++ b/src/testcurl/test_put.c
@@ -131,7 +131,7 @@ testInternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -187,7 +187,7 @@ testMultithreadedPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -244,7 +244,7 @@ testMultithreadedPoolPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1081,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
@@ -318,7 +318,7 @@ testExternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c
index db4db9d..48fef06 100644
--- a/src/testcurl/test_put_chunked.c
+++ b/src/testcurl/test_put_chunked.c
@@ -141,7 +141,7 @@ testInternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -197,7 +197,7 @@ testMultithreadedPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11081,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -254,7 +254,7 @@ testMultithreadedPoolPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11081,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
@@ -328,7 +328,7 @@ testExternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
11082,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index b572cfb..682d866 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -125,7 +125,7 @@ ServeOneRequest(void *param)
fd = (MHD_socket) (intptr_t) param;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_LISTEN_SOCKET, fd,
MHD_OPTION_NOTIFY_COMPLETED, &request_completed, &done,
@@ -204,12 +204,12 @@ testGet (int type, int pool_count, int poll_flag)
cbc.size = 2048;
cbc.pos = 0;
if (pool_count > 0) {
- d = MHD_start_daemon (type | MHD_USE_DEBUG | MHD_USE_ITC | poll_flag,
+ d = MHD_start_daemon (type | MHD_USE_ERROR_LOG | MHD_USE_ITC | poll_flag,
11080, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, pool_count,
MHD_OPTION_END);
} else {
- d = MHD_start_daemon (type | MHD_USE_DEBUG | MHD_USE_ITC | poll_flag,
+ d = MHD_start_daemon (type | MHD_USE_ERROR_LOG | MHD_USE_ITC | poll_flag,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
}
if (d == NULL)
@@ -346,7 +346,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
11080,
NULL, NULL,
&ahc_echo, "GET",
diff --git a/src/testcurl/test_start_stop.c b/src/testcurl/test_start_stop.c
index ac89340..7a4e36e 100644
--- a/src/testcurl/test_start_stop.c
+++ b/src/testcurl/test_start_stop.c
@@ -54,7 +54,7 @@ testInternalGet (int poll_flag)
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -67,7 +67,7 @@ testMultithreadedGet (int poll_flag)
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG | poll_flag,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG | poll_flag,
1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 2;
@@ -80,7 +80,7 @@ testMultithreadedPoolGet (int poll_flag)
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
1081, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_THREAD_POOL_SIZE, CPU_COUNT,
MHD_OPTION_END);
if (d == NULL)
@@ -94,7 +94,7 @@ testExternalGet ()
{
struct MHD_Daemon *d;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 8;
diff --git a/src/testcurl/test_termination.c b/src/testcurl/test_termination.c
index 01a5819..fc67c1e 100644
--- a/src/testcurl/test_termination.c
+++ b/src/testcurl/test_termination.c
@@ -91,7 +91,7 @@ main ()
{
struct MHD_Daemon *daemon;
- daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ daemon = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
PORT,
NULL,
NULL, connection_handler, NULL, MHD_OPTION_END);
diff --git a/src/testcurl/test_timeout.c b/src/testcurl/test_timeout.c
index 3d7379d..6968f00 100644
--- a/src/testcurl/test_timeout.c
+++ b/src/testcurl/test_timeout.c
@@ -172,7 +172,7 @@ testWithoutTimeout ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_TIMEOUT, 2,
@@ -227,7 +227,7 @@ testWithTimeout ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
1080,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_TIMEOUT, 2,
diff --git a/src/testcurl/test_urlparse.c b/src/testcurl/test_urlparse.c
index ca74add..9c1e64a 100644
--- a/src/testcurl/test_urlparse.c
+++ b/src/testcurl/test_urlparse.c
@@ -134,7 +134,7 @@ testInternalGet (int poll_flag)
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG |
poll_flag,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG |
poll_flag,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c
index ea1ace0..d454769 100644
--- a/src/testzzuf/test_get.c
+++ b/src/testzzuf/test_get.c
@@ -104,7 +104,7 @@ testInternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -148,7 +148,7 @@ testMultithreadedGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -203,7 +203,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testzzuf/test_get_chunked.c b/src/testzzuf/test_get_chunked.c
index 79179c6..8525928 100644
--- a/src/testzzuf/test_get_chunked.c
+++ b/src/testzzuf/test_get_chunked.c
@@ -130,7 +130,7 @@ testInternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 1;
@@ -171,7 +171,7 @@ testMultithreadedGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 16;
@@ -223,7 +223,7 @@ testExternalGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
if (d == NULL)
return 256;
diff --git a/src/testzzuf/test_long_header.c b/src/testzzuf/test_long_header.c
index f1b0575..0e0fb9e 100644
--- a/src/testzzuf/test_long_header.c
+++ b/src/testzzuf/test_long_header.c
@@ -103,7 +103,7 @@ testLongUrlGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080,
&apc_all,
NULL,
@@ -165,7 +165,7 @@ testLongHeaderGet ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080,
&apc_all,
NULL,
diff --git a/src/testzzuf/test_post.c b/src/testzzuf/test_post.c
index 7d8a266..d2c9ba8 100644
--- a/src/testzzuf/test_post.c
+++ b/src/testzzuf/test_post.c
@@ -157,7 +157,7 @@ testInternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -208,7 +208,7 @@ testMultithreadedPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
11080, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -271,7 +271,7 @@ testExternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
1082, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
diff --git a/src/testzzuf/test_post_form.c b/src/testzzuf/test_post_form.c
index c5e7026..647e31f 100644
--- a/src/testzzuf/test_post_form.c
+++ b/src/testzzuf/test_post_form.c
@@ -176,7 +176,7 @@ testInternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -227,7 +227,7 @@ testMultithreadedPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
11080, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
@@ -288,7 +288,7 @@ testExternalPost ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
1082, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_NOTIFY_COMPLETED, &completed_cb, NULL,
MHD_OPTION_END);
diff --git a/src/testzzuf/test_put.c b/src/testzzuf/test_put.c
index 71d7285..85785c3 100644
--- a/src/testzzuf/test_put.c
+++ b/src/testzzuf/test_put.c
@@ -128,7 +128,7 @@ testInternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -179,7 +179,7 @@ testMultithreadedPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -241,7 +241,7 @@ testExternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */ ,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/testzzuf/test_put_chunked.c b/src/testzzuf/test_put_chunked.c
index 22a9e88..40bc3f8 100644
--- a/src/testzzuf/test_put_chunked.c
+++ b/src/testzzuf/test_put_chunked.c
@@ -134,7 +134,7 @@ testInternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -185,7 +185,7 @@ testMultithreadedPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG,
11081,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -253,7 +253,7 @@ testExternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
+ d = MHD_start_daemon (MHD_USE_ERROR_LOG,
11082,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
diff --git a/src/testzzuf/test_put_large.c b/src/testzzuf/test_put_large.c
index 373ce3f..432ae71 100644
--- a/src/testzzuf/test_put_large.c
+++ b/src/testzzuf/test_put_large.c
@@ -142,7 +142,7 @@ testInternalPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG
*/ ,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -194,7 +194,7 @@ testMultithreadedPut ()
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_DEBUG */ ,
+ d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
MHD_USE_INTERNAL_POLLING_THREAD /* | MHD_USE_ERROR_LOG */ ,
11080,
NULL, NULL, &ahc_echo, &done_flag, MHD_OPTION_END);
if (d == NULL)
@@ -257,7 +257,7 @@ testExternalPut ()
cbc.size = 2048;
cbc.pos = 0;
multi = NULL;
- d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_DEBUG */,
+ d = MHD_start_daemon (MHD_NO_FLAG /* | MHD_USE_ERROR_LOG */,
11080,
NULL, NULL, &ahc_echo, &done_flag,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
hooks/post-receive
--
GNU libmicrohttpd
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. df98141b03a5c2fec11442f617e8842b6230b793,
gitolite <=