diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-08-24 15:02:16 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-08-24 15:02:16 +0000 |
commit | cd030ca9cae26ecc21a916fb8e51a26bf3a7f9c4 (patch) | |
tree | 1cf810bc2e7c8167fc6b1acf709c84ed18617e87 /src/include/microhttpd.h | |
parent | 9826ad54e0de815ca9a2b071717dc8aed1ce1a5c (diff) | |
download | libmicrohttpd-cd030ca9cae26ecc21a916fb8e51a26bf3a7f9c4.tar.gz libmicrohttpd-cd030ca9cae26ecc21a916fb8e51a26bf3a7f9c4.zip |
epoll is now supported on non-Linux platforms (namely illumos).
Renamed MHD options and updated documentation.
Diffstat (limited to 'src/include/microhttpd.h')
-rw-r--r-- | src/include/microhttpd.h | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index e44bb704..baff3974 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -126,7 +126,7 @@ typedef intptr_t ssize_t; | |||
126 | * Current version of the library. | 126 | * Current version of the library. |
127 | * 0x01093001 = 1.9.30-1. | 127 | * 0x01093001 = 1.9.30-1. |
128 | */ | 128 | */ |
129 | #define MHD_VERSION 0x00095008 | 129 | #define MHD_VERSION 0x00095009 |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * MHD-internal return code for "YES". | 132 | * MHD-internal return code for "YES". |
@@ -577,7 +577,7 @@ enum MHD_FLAG | |||
577 | * FD_SETSIZE`. This option is not compatible with using an | 577 | * FD_SETSIZE`. This option is not compatible with using an |
578 | * 'external' `select()` mode (as there is no API to get the file | 578 | * 'external' `select()` mode (as there is no API to get the file |
579 | * descriptors for the external select from MHD) and must also not | 579 | * descriptors for the external select from MHD) and must also not |
580 | * be used in combination with #MHD_USE_EPOLL_LINUX_ONLY. | 580 | * be used in combination with #MHD_USE_EPOLL. |
581 | */ | 581 | */ |
582 | MHD_USE_POLL = 64, | 582 | MHD_USE_POLL = 64, |
583 | 583 | ||
@@ -605,18 +605,29 @@ enum MHD_FLAG | |||
605 | 605 | ||
606 | /** | 606 | /** |
607 | * Use `epoll()` instead of `select()` or `poll()` for the event loop. | 607 | * Use `epoll()` instead of `select()` or `poll()` for the event loop. |
608 | * This option is only available on Linux; using the option on | 608 | * This option is only available on some systems; using the option on |
609 | * non-Linux systems will cause #MHD_start_daemon to fail. Using | 609 | * systems without epoll will cause #MHD_start_daemon to fail. Using |
610 | * this option is not supported with #MHD_USE_THREAD_PER_CONNECTION. | 610 | * this option is not supported with #MHD_USE_THREAD_PER_CONNECTION. |
611 | * @sa ::MHD_FEATURE_EPOLL | ||
611 | */ | 612 | */ |
612 | MHD_USE_EPOLL_LINUX_ONLY = 512, | 613 | MHD_USE_EPOLL = 512, |
614 | |||
615 | /** @deprecated */ | ||
616 | #define MHD_USE_EPOLL_LINUX_ONLY \ | ||
617 | _MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_LINUX_ONLY is deprecated, use MHD_USE_EPOLL") \ | ||
618 | MHD_USE_EPOLL | ||
613 | 619 | ||
614 | /** | 620 | /** |
615 | * Run using an internal thread (or thread pool) doing `epoll()`. | 621 | * Run using an internal thread (or thread pool) doing `epoll()`. |
616 | * This option is only available on Linux; using the option on | 622 | * This option is only available on Linux; using the option on |
617 | * non-Linux systems will cause #MHD_start_daemon to fail. | 623 | * non-Linux systems will cause #MHD_start_daemon to fail. |
618 | */ | 624 | */ |
619 | MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL_LINUX_ONLY, | 625 | MHD_USE_EPOLL_INTERNALLY = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL, |
626 | |||
627 | /** @deprecated */ | ||
628 | #define MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY \ | ||
629 | _MHD_DEPR_IN_MACRO("Value MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY is deprecated, use MHD_USE_EPOLL_INTERNALLY") \ | ||
630 | MHD_USE_EPOLL_INTERNALLY | ||
620 | 631 | ||
621 | /** | 632 | /** |
622 | * Force MHD to use a signal pipe to notify the event loop (of | 633 | * Force MHD to use a signal pipe to notify the event loop (of |
@@ -644,7 +655,7 @@ enum MHD_FLAG | |||
644 | /** | 655 | /** |
645 | * Enable `epoll()` turbo. Disables certain calls to `shutdown()` | 656 | * Enable `epoll()` turbo. Disables certain calls to `shutdown()` |
646 | * and enables aggressive non-blocking optimisitc reads. | 657 | * and enables aggressive non-blocking optimisitc reads. |
647 | * Most effects only happen with #MHD_USE_EPOLL_LINUX_ONLY. | 658 | * Most effects only happen with #MHD_USE_EPOLL. |
648 | * Enalbed always on W32 as winsock does not properly behave | 659 | * Enalbed always on W32 as winsock does not properly behave |
649 | * with `shutdown()` and this then fixes potential problems. | 660 | * with `shutdown()` and this then fixes potential problems. |
650 | */ | 661 | */ |
@@ -2750,8 +2761,8 @@ enum MHD_FEATURE | |||
2750 | 2761 | ||
2751 | /** | 2762 | /** |
2752 | * Get whether `epoll()` is supported. If supported then Flags | 2763 | * Get whether `epoll()` is supported. If supported then Flags |
2753 | * #MHD_USE_EPOLL_LINUX_ONLY and | 2764 | * #MHD_USE_EPOLL and |
2754 | * #MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY can be used. | 2765 | * #MHD_USE_EPOLL_INTERNALLY can be used. |
2755 | */ | 2766 | */ |
2756 | MHD_FEATURE_EPOLL = 7, | 2767 | MHD_FEATURE_EPOLL = 7, |
2757 | 2768 | ||