gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [libmicrohttpd] branch master updated (9174eb84 -> b91d61b7


From: gnunet
Subject: [GNUnet-SVN] [libmicrohttpd] branch master updated (9174eb84 -> b91d61b7)
Date: Fri, 10 Mar 2017 18:12:56 +0100

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 9174eb84 process_urh(): process all recv() before all send() to 
overcome limitations on some platforms
     new defb4e4d Fixed reset timeout on connection resume in 
thread-per-connection mode.
     new b91d61b7 thread_main_handle_connection(): use bool wider

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/daemon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index f25ccd4d..2761bc28 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1651,16 +1651,16 @@ thread_main_handle_connection (void *data)
 #endif
 #undef EXTRA_SLOTS
 #ifdef HAVE_POLL
-  const int use_poll = (0 != (daemon->options & MHD_USE_POLL));
+  const bool use_poll = (0 != (daemon->options & MHD_USE_POLL));
 #else  /* ! HAVE_POLL */
-  const int use_poll = MHD_NO;
+  const bool use_poll = 0;
 #endif /* ! HAVE_POLL */
+  bool was_suspended = false;
 
   while ( (! daemon->shutdown) &&
          (MHD_CONNECTION_CLOSED != con->state) )
     {
       const unsigned int timeout = daemon->connection_timeout;
-      bool was_suspended = false;
 #ifdef UPGRADE_SUPPORT
       struct MHD_UpgradeResponseHandle * const urh = con->urh;
 #else  /* ! UPGRADE_SUPPORT */
@@ -1773,7 +1773,7 @@ thread_main_handle_connection (void *data)
          tv.tv_usec = 0;
          tvp = &tv;
        }
-      if (0 == (daemon->options & MHD_USE_POLL))
+      if (! use_poll)
        {
          /* use select */
          bool err_state = false;

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]