aboutsummaryrefslogtreecommitdiff
path: root/doc/libmicrohttpd.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/libmicrohttpd.texi')
-rw-r--r--doc/libmicrohttpd.texi12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index 82bf9b23..182c1dd9 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -436,14 +436,14 @@ compiler).
436Options for the MHD daemon. 436Options for the MHD daemon.
437 437
438Note that if neither @code{MHD_USE_THREAD_PER_CONNECTION} nor 438Note that if neither @code{MHD_USE_THREAD_PER_CONNECTION} nor
439@code{MHD_USE_SELECT_INTERNALLY} is used, the client wants control over 439@code{MHD_USE_INTERNAL_POLLING_THREAD} is used, the client wants control over
440the process and will call the appropriate microhttpd callbacks. 440the process and will call the appropriate microhttpd callbacks.
441 441
442Starting the daemon may also fail if a particular option is not 442Starting the daemon may also fail if a particular option is not
443implemented or not supported on the target platform (i.e. no support for 443implemented or not supported on the target platform (i.e. no support for
444@acronym{SSL}, threads or IPv6). SSL support generally depends on 444@acronym{SSL}, threads or IPv6). SSL support generally depends on
445options given during MHD compilation. Threaded operations 445options given during MHD compilation. Threaded operations
446(including @code{MHD_USE_SELECT_INTERNALLY}) are not supported on 446(including @code{MHD_USE_INTERNAL_POLLING_THREAD}) are not supported on
447Symbian. 447Symbian.
448 448
449@table @code 449@table @code
@@ -468,7 +468,7 @@ NULL.
468@item MHD_USE_THREAD_PER_CONNECTION 468@item MHD_USE_THREAD_PER_CONNECTION
469Run using one thread per connection. 469Run using one thread per connection.
470 470
471@item MHD_USE_SELECT_INTERNALLY 471@item MHD_USE_INTERNAL_POLLING_THREAD
472Run using an internal thread doing @code{SELECT}. 472Run using an internal thread doing @code{SELECT}.
473 473
474@item MHD_USE_IPv6 474@item MHD_USE_IPv6
@@ -890,7 +890,7 @@ with the "--disable-messages" flag.
890Number (unsigned int) of threads in thread pool. Enable 890Number (unsigned int) of threads in thread pool. Enable
891thread pooling by setting this value to to something 891thread pooling by setting this value to to something
892greater than 1. Currently, thread model must be 892greater than 1. Currently, thread model must be
893MHD_USE_SELECT_INTERNALLY if thread pooling is enabled 893MHD_USE_INTERNAL_POLLING_THREAD if thread pooling is enabled
894(@code{MHD_start_daemon} returns @code{NULL} for an unsupported thread 894(@code{MHD_start_daemon} returns @code{NULL} for an unsupported thread
895model). 895model).
896 896
@@ -2663,7 +2663,7 @@ Request the file-descriptor number that MHD is using for epoll. If
2663the build is not supporting epoll, NULL is returned; if we are using a 2663the build is not supporting epoll, NULL is returned; if we are using a
2664thread pool or this daemon was not started with 2664thread pool or this daemon was not started with
2665@code{MHD_USE_EPOLL}, (a pointer to) -1 is returned. If we are 2665@code{MHD_USE_EPOLL}, (a pointer to) -1 is returned. If we are
2666using @code{MHD_USE_SELECT_INTERNALLY} or are in 'external' select mode, the 2666using @code{MHD_USE_INTERNAL_POLLING_THREAD} or are in 'external' select mode, the
2667internal epoll FD is returned. This function must be used in external 2667internal epoll FD is returned. This function must be used in external
2668select mode with epoll to obtain the FD to call epoll on. No extra 2668select mode with epoll to obtain the FD to call epoll on. No extra
2669arguments should be passed. 2669arguments should be passed.
@@ -2891,7 +2891,7 @@ MHD_USE_POLL can be used.
2891@item MHD_FEATURE_EPOLL 2891@item MHD_FEATURE_EPOLL
2892Get whether @code{epoll()} is supported. If supported then Flags 2892Get whether @code{epoll()} is supported. If supported then Flags
2893MHD_USE_EPOLL and 2893MHD_USE_EPOLL and
2894MHD_USE_EPOLL_INTERNALLY can be used. 2894MHD_USE_EPOLL_INTERNAL_THREAD can be used.
2895 2895
2896@item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET 2896@item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET
2897Get whether shutdown on listen socket to signal other 2897Get whether shutdown on listen socket to signal other