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

Speed-up closure of upgraded connection with daemon shutdown

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k) committed 2020-10-31 20:50:37 +03:00
1 parent cec7ee05dc
commit 9a224cc6ed
1 file changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/daemon.c
+6 -4
View File
@@ -1734,8 +1734,9 @@ thread_main_connection_upgrade (struct MHD_Connection *con)
{
struct timeval*tvp;
struct timeval tv;
if ( (con->tls_read_ready) &&
(urh->in_buffer_used < urh->in_buffer_size))
if (((con->tls_read_ready) &&
(urh->in_buffer_used < urh->in_buffer_size)) ||
(daemon->shutdown))
{ /* No need to wait if incoming data is already pending in TLS buffers. */
tv.tv_sec = 0;
tv.tv_usec = 0;
@@ -1792,8 +1793,9 @@ thread_main_connection_upgrade (struct MHD_Connection *con)
urh_update_pollfd (urh, p);
if ( (con->tls_read_ready) &&
(urh->in_buffer_used < urh->in_buffer_size))
if (((con->tls_read_ready) &&
(urh->in_buffer_used < urh->in_buffer_size)) ||
(daemon->shutdown))
timeout = 0; /* No need to wait if incoming data is already pending in TLS buffers. */
else
timeout = -1;