2 files changed, 6 insertions, 3 deletions

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index bdf08e00..0261c228 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1884,6 +1884,9 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
 #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 @@ MHD_start_daemon_va (unsigned int flags,
 #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. */
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index c0700ddf..286aee68 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -1183,9 +1183,9 @@ struct MHD_Daemon
   unsigned int per_ip_connection_limit;
 
   /**
-   * Daemon's options.
+   * Daemon's flags (bitfield).
    */
-  enum MHD_OPTION options;
+  enum MHD_FLAG options;
 
   /**
    * Listen port.