diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index fd40b341..2d6df1a2 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -1011,7 +1011,7 @@ internal_get_fdset2 (struct MHD_Daemon *daemon, | |||
1011 | fd_setsize); | 1011 | fd_setsize); |
1012 | #endif /* MHD_POSIX_SOCKETS */ | 1012 | #endif /* MHD_POSIX_SOCKETS */ |
1013 | break; | 1013 | break; |
1014 | case MHD_EVENT_LOOP_INFO_BLOCK: | 1014 | case MHD_EVENT_LOOP_INFO_PROCESS: |
1015 | if ( (NULL == except_fd_set) || | 1015 | if ( (NULL == except_fd_set) || |
1016 | ! MHD_add_to_fd_set_ (pos->socket_fd, | 1016 | ! MHD_add_to_fd_set_ (pos->socket_fd, |
1017 | except_fd_set, | 1017 | except_fd_set, |
@@ -1256,7 +1256,7 @@ call_handlers (struct MHD_Connection *con, | |||
1256 | if ( (! con->daemon->data_already_pending) && | 1256 | if ( (! con->daemon->data_already_pending) && |
1257 | (0 == (con->daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ) | 1257 | (0 == (con->daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ) |
1258 | { | 1258 | { |
1259 | if (0 != (MHD_EVENT_LOOP_INFO_BLOCK & con->event_loop_info)) | 1259 | if (0 != (MHD_EVENT_LOOP_INFO_PROCESS & con->event_loop_info)) |
1260 | con->daemon->data_already_pending = true; | 1260 | con->daemon->data_already_pending = true; |
1261 | #ifdef HTTPS_SUPPORT | 1261 | #ifdef HTTPS_SUPPORT |
1262 | else if ( (con->tls_read_ready) && | 1262 | else if ( (con->tls_read_ready) && |
@@ -1987,7 +1987,7 @@ thread_main_handle_connection (void *data) | |||
1987 | } | 1987 | } |
1988 | 1988 | ||
1989 | use_zero_timeout = | 1989 | use_zero_timeout = |
1990 | (0 != (MHD_EVENT_LOOP_INFO_BLOCK & con->event_loop_info) | 1990 | (0 != (MHD_EVENT_LOOP_INFO_PROCESS & con->event_loop_info) |
1991 | #ifdef HTTPS_SUPPORT | 1991 | #ifdef HTTPS_SUPPORT |
1992 | || ( (con->tls_read_ready) && | 1992 | || ( (con->tls_read_ready) && |
1993 | (0 != (MHD_EVENT_LOOP_INFO_READ & con->event_loop_info)) ) | 1993 | (0 != (MHD_EVENT_LOOP_INFO_READ & con->event_loop_info)) ) |
@@ -2042,7 +2042,7 @@ thread_main_handle_connection (void *data) | |||
2042 | FD_SETSIZE)) | 2042 | FD_SETSIZE)) |
2043 | err_state = true; | 2043 | err_state = true; |
2044 | break; | 2044 | break; |
2045 | case MHD_EVENT_LOOP_INFO_BLOCK: | 2045 | case MHD_EVENT_LOOP_INFO_PROCESS: |
2046 | if (! MHD_add_to_fd_set_ (con->socket_fd, | 2046 | if (! MHD_add_to_fd_set_ (con->socket_fd, |
2047 | &es, | 2047 | &es, |
2048 | &maxsock, | 2048 | &maxsock, |
@@ -2141,7 +2141,7 @@ thread_main_handle_connection (void *data) | |||
2141 | case MHD_EVENT_LOOP_INFO_WRITE: | 2141 | case MHD_EVENT_LOOP_INFO_WRITE: |
2142 | p[0].events |= POLLOUT | MHD_POLL_EVENTS_ERR_DISC; | 2142 | p[0].events |= POLLOUT | MHD_POLL_EVENTS_ERR_DISC; |
2143 | break; | 2143 | break; |
2144 | case MHD_EVENT_LOOP_INFO_BLOCK: | 2144 | case MHD_EVENT_LOOP_INFO_PROCESS: |
2145 | p[0].events |= MHD_POLL_EVENTS_ERR_DISC; | 2145 | p[0].events |= MHD_POLL_EVENTS_ERR_DISC; |
2146 | break; | 2146 | break; |
2147 | case MHD_EVENT_LOOP_INFO_CLEANUP: | 2147 | case MHD_EVENT_LOOP_INFO_CLEANUP: |
@@ -4759,7 +4759,7 @@ MHD_poll_all (struct MHD_Daemon *daemon, | |||
4759 | case MHD_EVENT_LOOP_INFO_WRITE: | 4759 | case MHD_EVENT_LOOP_INFO_WRITE: |
4760 | p[poll_server + i].events |= POLLOUT | MHD_POLL_EVENTS_ERR_DISC; | 4760 | p[poll_server + i].events |= POLLOUT | MHD_POLL_EVENTS_ERR_DISC; |
4761 | break; | 4761 | break; |
4762 | case MHD_EVENT_LOOP_INFO_BLOCK: | 4762 | case MHD_EVENT_LOOP_INFO_PROCESS: |
4763 | p[poll_server + i].events |= MHD_POLL_EVENTS_ERR_DISC; | 4763 | p[poll_server + i].events |= MHD_POLL_EVENTS_ERR_DISC; |
4764 | break; | 4764 | break; |
4765 | case MHD_EVENT_LOOP_INFO_CLEANUP: | 4765 | case MHD_EVENT_LOOP_INFO_CLEANUP: |