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

Clear send/recv-ready flags when using blocking sockets

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2025-04-01 07:53:44 +03:00
parent 47a7e70338
commit c9e0d7be94
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mhd2/mhd_recv.c
+7 -1
View File
@@ -61,7 +61,8 @@ mhd_recv_plain (struct MHD_Connection *restrict c,
if (0 <= res)
{
*received = (size_t) res;
if (buf_size > (size_t) res)
if ((buf_size > (size_t) res)
|| ! c->sk.props.is_nonblck)
c->sk.ready = (enum mhd_SocketNetState) /* Clear 'recv-ready' */
(((unsigned int) c->sk.ready)
& (~(enum mhd_SocketNetState)
@@ -109,6 +110,11 @@ mhd_recv_tls (struct MHD_Connection *restrict c,
mhd_SOCKET_NET_STATE_RECV_READY));
else if (mhd_SOCKET_ERR_NO_ERROR == res)
{
if (! c->sk.props.is_nonblck)
c->sk.ready = (enum mhd_SocketNetState) /* Clear 'recv-ready' */
(((unsigned int) c->sk.ready)
& (~(enum mhd_SocketNetState)
mhd_SOCKET_NET_STATE_RECV_READY));
if (res == buf_size)
{
if (mhd_tls_conn_has_data_in (c->tls))
src/mhd2/mhd_send.c
+17 -3
View File
@@ -805,7 +805,7 @@ mhd_send_plain (struct MHD_Connection *restrict c,
full_buf_sent = (buf_size == (size_t) res);
if (! full_buf_sent)
if (! full_buf_sent || ! c->sk.props.is_nonblck)
c->sk.ready = (enum mhd_SocketNetState) /* Clear 'send-ready' */
(((unsigned int) c->sk.ready)
& (~(enum mhd_SocketNetState)
@@ -858,6 +858,12 @@ mhd_send_tls (struct MHD_Connection *restrict c,
return res;
}
if (! c->sk.props.is_nonblck)
c->sk.ready = (enum mhd_SocketNetState) /* Clear 'send-ready' */
(((unsigned int) c->sk.ready)
& (~(enum mhd_SocketNetState)
mhd_SOCKET_NET_STATE_SEND_READY));
/* If there is a need to push the data from network buffers
* call post_send_setopt(). */
if (push_data && (buf_size == *sent))
@@ -1104,7 +1110,8 @@ mhd_send_hdr_and_body (struct MHD_Connection *restrict connection,
return err;
}
if ((header_size + body_size) > *sent)
if (((header_size + body_size) > *sent)
|| ! connection->sk.props.is_nonblck)
connection->sk.ready = (enum mhd_SocketNetState) /* Clear 'send-ready' */
(((unsigned int) connection->sk.ready)
& (~(enum mhd_SocketNetState)
@@ -1354,7 +1361,7 @@ mhd_send_sendfile (struct MHD_Connection *restrict c,
return mhd_SOCKET_ERR_INTR;
}
if ((mhd_SOCKET_ERR_AGAIN == ret) ||
if ((mhd_SOCKET_ERR_AGAIN == ret) || ! c->sk.props.is_nonblck ||
((mhd_SOCKET_ERR_NO_ERROR == ret) && (send_size > sent_bytes)))
c->sk.ready = (enum mhd_SocketNetState) /* Clear 'send-ready' */
(((unsigned int) c->sk.ready)
@@ -1502,6 +1509,13 @@ send_iov_nontls (struct MHD_Connection *restrict connection,
if (1)
{
size_t track_sent = (size_t) *sent;
if (! connection->sk.props.is_nonblck)
connection->sk.ready = (enum mhd_SocketNetState) /* Clear 'send-ready' */
(((unsigned int) connection->sk.ready)
& (~(enum mhd_SocketNetState)
mhd_SOCKET_NET_STATE_SEND_READY));
/* Adjust the internal tracking information for the iovec to
* take this last send into account. */
while ((0 != track_sent) && (r_iov->iov[r_iov->sent].iov_len <= track_sent))