diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 23310faf..9e3f6231 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -88,6 +88,8 @@ | |||
88 | #define DEBUG_CONNECT MHD_NO | 88 | #define DEBUG_CONNECT MHD_NO |
89 | 89 | ||
90 | 90 | ||
91 | /* Forward declarations. */ | ||
92 | |||
91 | /** | 93 | /** |
92 | * Close all connections for the daemon. | 94 | * Close all connections for the daemon. |
93 | * Must only be called when MHD_Daemon::shutdown was set to #MHD_YES. | 95 | * Must only be called when MHD_Daemon::shutdown was set to #MHD_YES. |
@@ -101,6 +103,19 @@ close_all_connections (struct MHD_Daemon *daemon); | |||
101 | 103 | ||
102 | 104 | ||
103 | /** | 105 | /** |
106 | * Do epoll()-based processing (this function is allowed to | ||
107 | * block if @a may_block is set to #MHD_YES). | ||
108 | * | ||
109 | * @param daemon daemon to run poll loop for | ||
110 | * @param may_block #MHD_YES if blocking, #MHD_NO if non-blocking | ||
111 | * @return #MHD_NO on serious errors, #MHD_YES on success | ||
112 | */ | ||
113 | static int | ||
114 | MHD_epoll (struct MHD_Daemon *daemon, | ||
115 | int may_block); | ||
116 | |||
117 | |||
118 | /** | ||
104 | * Default implementation of the panic function, | 119 | * Default implementation of the panic function, |
105 | * prints an error message and aborts. | 120 | * prints an error message and aborts. |
106 | * | 121 | * |
@@ -1069,7 +1084,7 @@ MHD_get_fdset2 (struct MHD_Daemon *daemon, | |||
1069 | _("MHD_get_fdset2() called with except_fd_set " | 1084 | _("MHD_get_fdset2() called with except_fd_set " |
1070 | "set to NULL. Such behavior is unsupported.\n")); | 1085 | "set to NULL. Such behavior is unsupported.\n")); |
1071 | #endif | 1086 | #endif |
1072 | except_fd_set = es; | 1087 | except_fd_set = &es; |
1073 | FD_ZERO(except_fd_set); | 1088 | FD_ZERO(except_fd_set); |
1074 | } | 1089 | } |
1075 | 1090 | ||
@@ -3442,7 +3457,7 @@ MHD_run_from_select (struct MHD_Daemon *daemon, | |||
3442 | _("MHD_run_from_select() called with except_fd_set " | 3457 | _("MHD_run_from_select() called with except_fd_set " |
3443 | "set to NULL. Such behavior is deprecated.\n")); | 3458 | "set to NULL. Such behavior is deprecated.\n")); |
3444 | #endif | 3459 | #endif |
3445 | except_fd_set = es; | 3460 | except_fd_set = &es; |
3446 | FD_ZERO(except_fd_set); | 3461 | FD_ZERO(except_fd_set); |
3447 | } | 3462 | } |
3448 | if (0 != (daemon->options & MHD_USE_EPOLL)) | 3463 | if (0 != (daemon->options & MHD_USE_EPOLL)) |