[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: Simplified checks fo
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: Simplified checks for internal polling thread. |
Date: |
Sun, 19 Feb 2017 16:39:43 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new 0c8a6adb Simplified checks for internal polling thread.
0c8a6adb is described below
commit 0c8a6adb184e11a56550537526a5e6c2123ad2e2
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Feb 12 17:33:33 2017 +0300
Simplified checks for internal polling thread.
---
src/microhttpd/connection.c | 6 ++----
src/microhttpd/daemon.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 7cd60da9..3ce34f65 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1410,8 +1410,7 @@ MHD_connection_update_event_loop_info (struct
MHD_Connection *connection)
{
if ((MHD_YES != try_grow_read_buffer (connection)) &&
(0 != (connection->daemon->options &
- (MHD_USE_INTERNAL_POLLING_THREAD |
- MHD_USE_THREAD_PER_CONNECTION))))
+ MHD_USE_INTERNAL_POLLING_THREAD)))
{
/* failed to grow the read buffer, and the
client which is supposed to handle the
@@ -2007,8 +2006,7 @@ process_request_body (struct MHD_Connection *connection)
/* client did not process all POST data, complain if
the setup was incorrect, which may prevent us from
handling the rest of the request */
- if ( ( (0 != (connection->daemon->options &
MHD_USE_THREAD_PER_CONNECTION)) ||
- (0 != (connection->daemon->options &
MHD_USE_INTERNAL_POLLING_THREAD)) ) &&
+ if ( (0 != (connection->daemon->options &
MHD_USE_INTERNAL_POLLING_THREAD)) &&
(! connection->suspended) )
MHD_DLOG (connection->daemon,
_("WARNING: incomplete POST processing and connection not
suspended will result in hung connection.\n"));
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 7c4dcde1..c83a51d5 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2998,7 +2998,7 @@ MHD_run_from_select (struct MHD_Daemon *daemon,
struct MHD_UpgradeResponseHandle *urhn;
#endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
unsigned int mask = MHD_ALLOW_SUSPEND_RESUME | MHD_USE_EPOLL_INTERNAL_THREAD
|
- MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_POLL_INTERNAL_THREAD |
MHD_USE_THREAD_PER_CONNECTION;
+ MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_POLL_INTERNAL_THREAD;
/* Clear ITC to avoid spinning select */
/* Do it before any other processing so new signals
--
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: Simplified checks for internal polling thread.,
gnunet <=