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

[gnunet]

Author: grothoff
Date: 2016-06-02 08:55:55 +0200 (Thu, 02 Jun 2016)
New Revision: 37231

Modified:
   libmicrohttpd/src/microhttpd/connection.c
   libmicrohttpd/src/microhttpd/daemon.c
Log:
-fix branching, might have FD_CLR'ed -1 otherwise

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2016-06-02 06:53:21 UTC (rev 
37230)
+++ libmicrohttpd/src/microhttpd/connection.c   2016-06-02 06:55:55 UTC (rev 
37231)
@@ -750,7 +750,7 @@
 
 
 /**
- * Produce HTTP "Date:" header.
+ * Produce HTTP time stamp.
  *
  * @param date where to write the header, with
  *        at least 128 bytes available space.
@@ -788,14 +788,14 @@
   now = *pNow;
 #endif
   sprintf (date,
-             "Date: %3s, %02u %3s %04u %02u:%02u:%02u GMT\r\n",
-             days[now.tm_wday % 7],
-             (unsigned int) now.tm_mday,
-             mons[now.tm_mon % 12],
-             (unsigned int) (1900 + now.tm_year),
-             (unsigned int) now.tm_hour,
-             (unsigned int) now.tm_min,
-             (unsigned int) now.tm_sec);
+           "Date: %3s, %02u %3s %04u %02u:%02u:%02u GMT\r\n",
+           days[now.tm_wday % 7],
+           (unsigned int) now.tm_mday,
+           mons[now.tm_mon % 12],
+           (unsigned int) (1900 + now.tm_year),
+           (unsigned int) now.tm_hour,
+           (unsigned int) now.tm_min,
+           (unsigned int) now.tm_sec);
 }
 
 

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-06-02 06:53:21 UTC (rev 
37230)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-06-02 06:55:55 UTC (rev 
37231)
@@ -2443,10 +2443,10 @@
          we do not miss the shutdown, so only do this
          optimization if we have a shutdown signaling
          pipe. */
-      if ( ( (MHD_INVALID_SOCKET != daemon->socket_fd) &&
-             (daemon->connections == daemon->connection_limit) &&
+      if ( (MHD_INVALID_SOCKET != daemon->socket_fd) &&
+           ( ( (daemon->connections == daemon->connection_limit) &&
              (0 != (daemon->options & MHD_USE_PIPE_FOR_SHUTDOWN)) ) ||
-           (MHD_YES == daemon->at_limit) )
+             (MHD_YES == daemon->at_limit) ) )
         FD_CLR (daemon->socket_fd, &rs);
     }
   else