mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed one state in MHD_ConnectionEventLoopInfo for clarity

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2022-10-22 09:48:06 +03:00
parent 699b6cd563
commit 9fef2196c6
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/connection.c
+5 -5
View File
@@ -2543,7 +2543,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
if (! connection->discard_request)
connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ;
else
connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK;
connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
break;
case MHD_CONNECTION_HEADERS_RECEIVED:
mhd_assert (0);
@@ -2583,7 +2583,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
(! connection->discard_request) )
connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ;
else
connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK;
connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
break;
case MHD_CONNECTION_BODY_RECEIVED:
case MHD_CONNECTION_FOOTER_PART_RECEIVED:
@@ -2603,7 +2603,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
mhd_assert (0);
break;
case MHD_CONNECTION_FULL_REQ_RECEIVED:
connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK;
connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
break;
case MHD_CONNECTION_START_REPLY:
mhd_assert (0);
@@ -2619,13 +2619,13 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection)
connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE;
break;
case MHD_CONNECTION_NORMAL_BODY_UNREADY:
connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK;
connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
break;
case MHD_CONNECTION_CHUNKED_BODY_READY:
connection->event_loop_info = MHD_EVENT_LOOP_INFO_WRITE;
break;
case MHD_CONNECTION_CHUNKED_BODY_UNREADY:
connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK;
connection->event_loop_info = MHD_EVENT_LOOP_INFO_PROCESS;
break;
case MHD_CONNECTION_CHUNKED_BODY_SENT:
mhd_assert (0);
src/microhttpd/daemon.c
+6 -6
View File
@@ -1011,7 +1011,7 @@ internal_get_fdset2 (struct MHD_Daemon *daemon,
fd_setsize);
#endif /* MHD_POSIX_SOCKETS */
break;
case MHD_EVENT_LOOP_INFO_BLOCK:
case MHD_EVENT_LOOP_INFO_PROCESS:
if ( (NULL == except_fd_set) ||
! MHD_add_to_fd_set_ (pos->socket_fd,
except_fd_set,
@@ -1256,7 +1256,7 @@ call_handlers (struct MHD_Connection *con,
if ( (! con->daemon->data_already_pending) &&
(0 == (con->daemon->options & MHD_USE_THREAD_PER_CONNECTION)) )
{
if (0 != (MHD_EVENT_LOOP_INFO_BLOCK & con->event_loop_info))
if (0 != (MHD_EVENT_LOOP_INFO_PROCESS & con->event_loop_info))
con->daemon->data_already_pending = true;
#ifdef HTTPS_SUPPORT
else if ( (con->tls_read_ready) &&
@@ -1987,7 +1987,7 @@ thread_main_handle_connection (void *data)
}
use_zero_timeout =
(0 != (MHD_EVENT_LOOP_INFO_BLOCK & con->event_loop_info)
(0 != (MHD_EVENT_LOOP_INFO_PROCESS & con->event_loop_info)
#ifdef HTTPS_SUPPORT
|| ( (con->tls_read_ready) &&
(0 != (MHD_EVENT_LOOP_INFO_READ & con->event_loop_info)) )
@@ -2042,7 +2042,7 @@ thread_main_handle_connection (void *data)
FD_SETSIZE))
err_state = true;
break;
case MHD_EVENT_LOOP_INFO_BLOCK:
case MHD_EVENT_LOOP_INFO_PROCESS:
if (! MHD_add_to_fd_set_ (con->socket_fd,
&es,
&maxsock,
@@ -2141,7 +2141,7 @@ thread_main_handle_connection (void *data)
case MHD_EVENT_LOOP_INFO_WRITE:
p[0].events |= POLLOUT | MHD_POLL_EVENTS_ERR_DISC;
break;
case MHD_EVENT_LOOP_INFO_BLOCK:
case MHD_EVENT_LOOP_INFO_PROCESS:
p[0].events |= MHD_POLL_EVENTS_ERR_DISC;
break;
case MHD_EVENT_LOOP_INFO_CLEANUP:
@@ -4759,7 +4759,7 @@ MHD_poll_all (struct MHD_Daemon *daemon,
case MHD_EVENT_LOOP_INFO_WRITE:
p[poll_server + i].events |= POLLOUT | MHD_POLL_EVENTS_ERR_DISC;
break;
case MHD_EVENT_LOOP_INFO_BLOCK:
case MHD_EVENT_LOOP_INFO_PROCESS:
p[poll_server + i].events |= MHD_POLL_EVENTS_ERR_DISC;
break;
case MHD_EVENT_LOOP_INFO_CLEANUP:
src/microhttpd/internal.h
+2 -2
View File
@@ -224,14 +224,14 @@ enum MHD_ConnectionEventLoopInfo
/**
* We are waiting for the application to provide data.
*/
MHD_EVENT_LOOP_INFO_BLOCK = 1 << 2,
MHD_EVENT_LOOP_INFO_PROCESS = 1 << 2,
/**
* Some data is ready to be processed, but more data could
* be read.
*/
MHD_EVENT_LOOP_INFO_PROCESS_READ =
MHD_EVENT_LOOP_INFO_READ | MHD_EVENT_LOOP_INFO_BLOCK,
MHD_EVENT_LOOP_INFO_READ | MHD_EVENT_LOOP_INFO_PROCESS,
/**
* We are finished and are awaiting cleanup.