[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 05/15: Renamed one state in MHD_ConnectionEventLoopInfo
From: |
gnunet |
Subject: |
[libmicrohttpd] 05/15: Renamed one state in MHD_ConnectionEventLoopInfo for clarity |
Date: |
Fri, 28 Oct 2022 11:21:54 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 9fef2196c6dbd8c54f4291bf80a4ced03de7660b
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Thu Oct 20 19:23:54 2022 +0300
Renamed one state in MHD_ConnectionEventLoopInfo for clarity
---
src/microhttpd/connection.c | 10 +++++-----
src/microhttpd/daemon.c | 12 ++++++------
src/microhttpd/internal.h | 4 ++--
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)
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);
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,
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:
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
/**
* 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.
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] 03/15: New values for MHD_ConnectionEventLoopInfo, (continued)
- [libmicrohttpd] 03/15: New values for MHD_ConnectionEventLoopInfo, gnunet, 2022/10/28
- [libmicrohttpd] 12/15: test_head: added check for excess data in reply, gnunet, 2022/10/28
- [libmicrohttpd] 04/15: Added new state for MHD_ConnectionEventLoopInfo, gnunet, 2022/10/28
- [libmicrohttpd] 14/15: postprocessor.h: fixed typos in doxy, gnunet, 2022/10/28
- [libmicrohttpd] 11/15: testcurl: added test with Content-Length broken value in request, gnunet, 2022/10/28
- [libmicrohttpd] 08/15: Do not send "100 Continue" if part of the request body is already received, gnunet, 2022/10/28
- [libmicrohttpd] 01/15: Added ability to check for MHD debug builds at run-time, gnunet, 2022/10/28
- [libmicrohttpd] 02/15: Added check for hypothetical too large accepted sockets addresses, gnunet, 2022/10/28
- [libmicrohttpd] 13/15: test_head: check libcurl for timeout value, gnunet, 2022/10/28
- [libmicrohttpd] 06/15: Renamed one more connection state for clarity, gnunet, 2022/10/28
- [libmicrohttpd] 05/15: Renamed one state in MHD_ConnectionEventLoopInfo for clarity,
gnunet <=
- [libmicrohttpd] 10/15: connection.c: fixed handling of various errors automatically detected by MHD code, gnunet, 2022/10/28
- [libmicrohttpd] 09/15: Reworked partial processing of the upload, gnunet, 2022/10/28
- [libmicrohttpd] 15/15: microhttpd.h: doxy improvements, gnunet, 2022/10/28
- [libmicrohttpd] 07/15: Do not send "100 Continue" if request does not have a body, gnunet, 2022/10/28