diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-04-29 16:42:00 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-04-29 16:42:00 +0200 |
commit | 36fa35cf04237467ad2acfeca3f8875764b99453 (patch) | |
tree | 0c56fc8251d8caadd996ed8185e185ebd0102bfe | |
parent | 660e7967fa1ce983917346d33205633496bde451 (diff) | |
parent | 0e12cc26791c3d38023f593f5242bdcff5e548de (diff) | |
download | libmicrohttpd-36fa35cf04237467ad2acfeca3f8875764b99453.tar.gz libmicrohttpd-36fa35cf04237467ad2acfeca3f8875764b99453.zip |
Merge branch 'master' of git+ssh://gnunet.org/libmicrohttpd
-rw-r--r-- | src/microhttpd/daemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 660ee61e..1c0fcb7e 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -5992,7 +5992,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5992 | #endif | 5992 | #endif |
5993 | #endif | 5993 | #endif |
5994 | 5994 | ||
5995 | /* Thread pooling currently works only with internal select thread mode */ | 5995 | /* Thread polling currently works only with internal select thread mode */ |
5996 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) | 5996 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) |
5997 | if ( (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) && | 5997 | if ( (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) && |
5998 | (daemon->worker_pool_size > 0) ) | 5998 | (daemon->worker_pool_size > 0) ) |
@@ -6000,7 +6000,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
6000 | #ifdef HAVE_MESSAGES | 6000 | #ifdef HAVE_MESSAGES |
6001 | MHD_DLOG (daemon, | 6001 | MHD_DLOG (daemon, |
6002 | _ ( | 6002 | _ ( |
6003 | "MHD thread pooling only works with MHD_USE_INTERNAL_POLLING_THREAD\n")); | 6003 | "MHD thread polling only works with MHD_USE_INTERNAL_POLLING_THREAD\n")); |
6004 | #endif | 6004 | #endif |
6005 | goto free_and_fail; | 6005 | goto free_and_fail; |
6006 | } | 6006 | } |
@@ -6488,7 +6488,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
6488 | struct MHD_Daemon *d = &daemon->worker_pool[i]; | 6488 | struct MHD_Daemon *d = &daemon->worker_pool[i]; |
6489 | 6489 | ||
6490 | memcpy (d, daemon, sizeof (struct MHD_Daemon)); | 6490 | memcpy (d, daemon, sizeof (struct MHD_Daemon)); |
6491 | /* Adjust pooling params for worker daemons; note that memcpy() | 6491 | /* Adjust polling params for worker daemons; note that memcpy() |
6492 | has already copied MHD_USE_INTERNAL_POLLING_THREAD thread mode into | 6492 | has already copied MHD_USE_INTERNAL_POLLING_THREAD thread mode into |
6493 | the worker threads. */ | 6493 | the worker threads. */ |
6494 | d->master = daemon; | 6494 | d->master = daemon; |