diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-07 23:15:42 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-11-08 00:54:59 +0300 |
commit | a48ca85fb74479a8a81e137138a30fab58f3eb1e (patch) | |
tree | 9089a6392d1c21466259a46f7139c18644274e5a /doc/libmicrohttpd.texi | |
parent | 4e4a1ce2bb9f6cd1d38fdc5f169d8956afab70c0 (diff) | |
download | libmicrohttpd-a48ca85fb74479a8a81e137138a30fab58f3eb1e.tar.gz libmicrohttpd-a48ca85fb74479a8a81e137138a30fab58f3eb1e.zip |
Renamed daemon flags:
MHD_USE_SELECT_INTERNALLY -> MHD_USE_INTERNAL_POLLING_THREAD
MHD_USE_POLL_INTERNALLY -> MHD_USE_POLL_INTERNAL_THREAD
MHD_USE_EPOLL_INTERNALLY -> MHD_USE_EPOLL_INTERNAL_THREAD
Diffstat (limited to 'doc/libmicrohttpd.texi')
-rw-r--r-- | doc/libmicrohttpd.texi | 12 |
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). | |||
436 | Options for the MHD daemon. | 436 | Options for the MHD daemon. |
437 | 437 | ||
438 | Note that if neither @code{MHD_USE_THREAD_PER_CONNECTION} nor | 438 | Note 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 |
440 | the process and will call the appropriate microhttpd callbacks. | 440 | the process and will call the appropriate microhttpd callbacks. |
441 | 441 | ||
442 | Starting the daemon may also fail if a particular option is not | 442 | Starting the daemon may also fail if a particular option is not |
443 | implemented or not supported on the target platform (i.e. no support for | 443 | implemented 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 |
445 | options given during MHD compilation. Threaded operations | 445 | options 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 |
447 | Symbian. | 447 | Symbian. |
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 |
469 | Run using one thread per connection. | 469 | Run using one thread per connection. |
470 | 470 | ||
471 | @item MHD_USE_SELECT_INTERNALLY | 471 | @item MHD_USE_INTERNAL_POLLING_THREAD |
472 | Run using an internal thread doing @code{SELECT}. | 472 | Run 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. | |||
890 | Number (unsigned int) of threads in thread pool. Enable | 890 | Number (unsigned int) of threads in thread pool. Enable |
891 | thread pooling by setting this value to to something | 891 | thread pooling by setting this value to to something |
892 | greater than 1. Currently, thread model must be | 892 | greater than 1. Currently, thread model must be |
893 | MHD_USE_SELECT_INTERNALLY if thread pooling is enabled | 893 | MHD_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 |
895 | model). | 895 | model). |
896 | 896 | ||
@@ -2663,7 +2663,7 @@ Request the file-descriptor number that MHD is using for epoll. If | |||
2663 | the build is not supporting epoll, NULL is returned; if we are using a | 2663 | the build is not supporting epoll, NULL is returned; if we are using a |
2664 | thread pool or this daemon was not started with | 2664 | thread 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 |
2666 | using @code{MHD_USE_SELECT_INTERNALLY} or are in 'external' select mode, the | 2666 | using @code{MHD_USE_INTERNAL_POLLING_THREAD} or are in 'external' select mode, the |
2667 | internal epoll FD is returned. This function must be used in external | 2667 | internal epoll FD is returned. This function must be used in external |
2668 | select mode with epoll to obtain the FD to call epoll on. No extra | 2668 | select mode with epoll to obtain the FD to call epoll on. No extra |
2669 | arguments should be passed. | 2669 | arguments should be passed. |
@@ -2891,7 +2891,7 @@ MHD_USE_POLL can be used. | |||
2891 | @item MHD_FEATURE_EPOLL | 2891 | @item MHD_FEATURE_EPOLL |
2892 | Get whether @code{epoll()} is supported. If supported then Flags | 2892 | Get whether @code{epoll()} is supported. If supported then Flags |
2893 | MHD_USE_EPOLL and | 2893 | MHD_USE_EPOLL and |
2894 | MHD_USE_EPOLL_INTERNALLY can be used. | 2894 | MHD_USE_EPOLL_INTERNAL_THREAD can be used. |
2895 | 2895 | ||
2896 | @item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET | 2896 | @item MHD_FEATURE_SHUTDOWN_LISTEN_SOCKET |
2897 | Get whether shutdown on listen socket to signal other | 2897 | Get whether shutdown on listen socket to signal other |