gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r35499 - libmicrohttpd/src/microhttpd


From: gnunet
Subject: [GNUnet-SVN] r35499 - libmicrohttpd/src/microhttpd
Date: Sat, 4 Apr 2015 18:06:58 +0200

Author: grothoff
Date: 2015-04-04 18:06:57 +0200 (Sat, 04 Apr 2015)
New Revision: 35499

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
   libmicrohttpd/src/microhttpd/internal.h
Log:
-fix minor type issue, and minor logging issue

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-04-04 15:50:15 UTC (rev 
35498)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-04-04 16:06:57 UTC (rev 
35499)
@@ -1884,6 +1884,9 @@
 #if HAVE_MESSAGES
       const int err = MHD_socket_errno_;
       /* This could be a common occurance with multiple worker threads */
+      if ( (EINVAL == err) &&
+           (MHD_INVALID_SOCKET == daemon->socket_fd) )
+        return MHD_NO; /* can happen during shutdown */
       if ((EAGAIN != err) && (EWOULDBLOCK != err))
         MHD_DLOG (daemon,
                  "Error accepting connection: %s\n",
@@ -3514,7 +3517,7 @@
 #endif
   daemon->socket_fd = MHD_INVALID_SOCKET;
   daemon->listening_address_reuse = 0;
-  daemon->options = (enum MHD_OPTION) flags;
+  daemon->options = flags;
 #if WINDOWS
   /* Winsock is broken with respect to 'shutdown';
      this disables us calling 'shutdown' on W32. */

Modified: libmicrohttpd/src/microhttpd/internal.h
===================================================================
--- libmicrohttpd/src/microhttpd/internal.h     2015-04-04 15:50:15 UTC (rev 
35498)
+++ libmicrohttpd/src/microhttpd/internal.h     2015-04-04 16:06:57 UTC (rev 
35499)
@@ -1183,9 +1183,9 @@
   unsigned int per_ip_connection_limit;
 
   /**
-   * Daemon's options.
+   * Daemon's flags (bitfield).
    */
-  enum MHD_OPTION options;
+  enum MHD_FLAG options;
 
   /**
    * Listen port.




reply via email to

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