gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 7d


From: gitolite
Subject: [GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 7d0221189929a3251d956166f82b06c456b33ed9
Date: Fri, 28 Oct 2016 18:54:54 +0200 (CEST)

The branch, master has been updated
       via  7d0221189929a3251d956166f82b06c456b33ed9 (commit)
      from  dd327c1d13252373cd1730e445d19930417571bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7d0221189929a3251d956166f82b06c456b33ed9
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Fri Oct 28 19:49:57 2016 +0300

    Fixed data races in thread-per-connection mode.

-----------------------------------------------------------------------

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

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index da764ca..fcbfe10 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1770,8 +1770,9 @@ exit:
     {
       shutdown (con->socket_fd,
                 SHUT_WR);
-      MHD_socket_close_chk_ (con->socket_fd);
-      con->socket_fd = MHD_INVALID_SOCKET;
+      /* 'socket_fd' can be used in other thread to signal shutdown.
+       * To avoid data races, do not close socket here. Daemon will
+       * use more connections only after cleanup anyway. */
     }
   return (MHD_THRD_RTRN_TYPE_) 0;
 }


hooks/post-receive
-- 
GNU libmicrohttpd



reply via email to

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