[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: reset timeout on res
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: reset timeout on response being queued, needed in thread-per-connection mode if the working thread takes very long |
Date: |
Thu, 13 Dec 2018 22:52:59 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new 1619b9f0 reset timeout on response being queued, needed in
thread-per-connection mode if the working thread takes very long
1619b9f0 is described below
commit 1619b9f051ac4694d563803ec25dad724f417ab4
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Dec 13 22:51:05 2018 +0100
reset timeout on response being queued, needed in thread-per-connection
mode if the working thread takes very long
---
ChangeLog | 4 ++++
src/microhttpd/connection.c | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index c250ef2e..7a895911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 13 22:48:14 CET 2018
+ Fix connection timeout logic if in thread-per-connection mode the
+ working thread takes longer than the timeout to queue the response. -CG
+
Tue Dec 11 09:58:32 CET 2018
Add logic to avoid VLA arrays with compilers that do not support them.
-CG
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index d521c036..e06ae993 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3655,7 +3655,7 @@ MHD_connection_handle_idle (struct MHD_Connection
*connection)
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
if (NULL != connection->response->crc)
MHD_mutex_lock_chk_ (&connection->response->mutex);
-#endif
+#endif
if ( (0 == connection->response->total_size) ||
(connection->response_write_position ==
connection->response->total_size) )
@@ -4099,6 +4099,7 @@ MHD_queue_response (struct MHD_Connection *connection,
}
if (! connection->in_idle)
(void) MHD_connection_handle_idle (connection);
+ MHD_update_last_activity_ (connection);
return MHD_YES;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] branch master updated: reset timeout on response being queued, needed in thread-per-connection mode if the working thread takes very long,
gnunet <=