aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/microhttpd/connection.c10
-rw-r--r--src/microhttpd/daemon.c12
-rw-r--r--src/microhttpd/internal.h4
3 files changed, 13 insertions, 13 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 3cc4fe00..da2cd248 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -2543,7 +2543,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
2543 if (! connection->discard_request) 2543 if (! connection->discard_request)
2544 connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; 2544 connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ;
2545 else 2545 else
2546 connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; 2546 connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
2547 break; 2547 break;
2548 case MHD_CONNECTION_HEADERS_RECEIVED: 2548 case MHD_CONNECTION_HEADERS_RECEIVED:
2549 mhd_assert (0); 2549 mhd_assert (0);
@@ -2583,7 +2583,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
2583 (! connection->discard_request) ) 2583 (! connection->discard_request) )
2584 connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; 2584 connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ;
2585 else 2585 else
2586 connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; 2586 connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
2587 break; 2587 break;
2588 case MHD_CONNECTION_BODY_RECEIVED: 2588 case MHD_CONNECTION_BODY_RECEIVED:
2589 case MHD_CONNECTION_FOOTER_PART_RECEIVED: 2589 case MHD_CONNECTION_FOOTER_PART_RECEIVED:
@@ -2603,7 +2603,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
2603 mhd_assert (0); 2603 mhd_assert (0);
2604 break; 2604 break;
2605 case MHD_CONNECTION_FULL_REQ_RECEIVED: 2605 case MHD_CONNECTION_FULL_REQ_RECEIVED:
2606 connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; 2606 connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
2607 break; 2607 break;
2608 case MHD_CONNECTION_START_REPLY: 2608 case MHD_CONNECTION_START_REPLY:
2609 mhd_assert (0); 2609 mhd_assert (0);
@@ -2619,13 +2619,13 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
2619 connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; 2619 connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE;
2620 break; 2620 break;
2621 case MHD_CONNECTION_NORMAL_BODY_UNREADY: 2621 case MHD_CONNECTION_NORMAL_BODY_UNREADY:
2622 connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; 2622 connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
2623 break; 2623 break;
2624 case MHD_CONNECTION_CHUNKED_BODY_READY: 2624 case MHD_CONNECTION_CHUNKED_BODY_READY:
2625 connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE; 2625 connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE;
2626 break; 2626 break;
2627 case MHD_CONNECTION_CHUNKED_BODY_UNREADY: 2627 case MHD_CONNECTION_CHUNKED_BODY_UNREADY:
2628 connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; 2628 connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
2629 break; 2629 break;
2630 case MHD_CONNECTION_CHUNKED_BODY_SENT: 2630 case MHD_CONNECTION_CHUNKED_BODY_SENT:
2631 mhd_assert (0); 2631 mhd_assert (0);
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:
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 89a68772..1565c21f 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -224,14 +224,14 @@ enum MHD_ConnectionEventLoopInfo
224 /** 224 /**
225 * We are waiting for the application to provide data. 225 * We are waiting for the application to provide data.
226 */ 226 */
227 MHD_EVENT_LOOP_INFO_BLOCK = 1 << 2, 227 MHD_EVENT_LOOP_INFO_PROCESS = 1 << 2,
228 228
229 /** 229 /**
230 * Some data is ready to be processed, but more data could 230 * Some data is ready to be processed, but more data could
231 * be read. 231 * be read.
232 */ 232 */
233 MHD_EVENT_LOOP_INFO_PROCESS_READ = 233 MHD_EVENT_LOOP_INFO_PROCESS_READ =
234 MHD_EVENT_LOOP_INFO_READ | MHD_EVENT_LOOP_INFO_BLOCK, 234 MHD_EVENT_LOOP_INFO_READ | MHD_EVENT_LOOP_INFO_PROCESS,
235 235
236 /** 236 /**
237 * We are finished and are awaiting cleanup. 237 * We are finished and are awaiting cleanup.