[GNUnet-SVN] r10747 - in libmicrohttpd: . src/daemon src/include

[gnunet]

Author: grothoff
Date: 2010-04-01 23:53:24 +0200 (Thu, 01 Apr 2010)
New Revision: 10747

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/include/microhttpd.h
Log:
allow NULL for max arg to get_fdset

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2010-04-01 20:26:10 UTC (rev 10746)
+++ libmicrohttpd/ChangeLog     2010-04-01 21:53:24 UTC (rev 10747)
@@ -1,3 +1,6 @@
+Sat Mar 13 09:41:01 CET 2010
+       Releasing libmicrohttpd 0.4.6. -CG
+
 Wed Mar 10 13:18:26 CET 2010
        Fixing bug in 100 CONTINUE replacement when handling POSTs
        (see report on mailinglist), with testcase. -CG/MC

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2010-04-01 20:26:10 UTC (rev 10746)
+++ libmicrohttpd/configure.ac  2010-04-01 21:53:24 UTC (rev 10747)
@@ -21,14 +21,14 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.4.5],address@hidden)
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.5])
+AC_INIT([libmicrohttpd], [0.4.6],address@hidden)
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.6])
 AM_CONFIG_HEADER([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
 LIB_VERSION_CURRENT=7
-LIB_VERSION_REVISION=0
+LIB_VERSION_REVISION=1
 LIB_VERSION_AGE=2
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2010-04-01 20:26:10 UTC (rev 
10746)
+++ libmicrohttpd/src/daemon/connection.c       2010-04-01 21:53:24 UTC (rev 
10747)
@@ -693,7 +693,8 @@
 do_fd_set (int fd, fd_set * set, int *max_fd)
 {
   FD_SET (fd, set);
-  if (fd > *max_fd)
+  if ( (NULL != max_fd) &&
+       (fd > *max_fd) )
     *max_fd = fd;
 }
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2010-04-01 20:26:10 UTC (rev 10746)
+++ libmicrohttpd/src/daemon/daemon.c   2010-04-01 21:53:24 UTC (rev 10747)
@@ -439,6 +439,12 @@
 /**
  * Obtain the select sets for this daemon.
  *
+ * @param daemon daemon to get sets from
+ * @param read_fd_set read set
+ * @param write_fd_set write set
+ * @param except_fd_set except set
+ * @param max_fd increased to largest FD added (if larger
+ *               than existing value); can be NULL
  * @return MHD_YES on success, MHD_NO if this
  *         daemon was not started with the right
  *         options for this call.
@@ -460,7 +466,8 @@
 
   FD_SET (fd, read_fd_set);
   /* update max file descriptor */
-  if ((*max_fd) < fd)
+  if ( (NULL != max_fd) &&
+       ((*max_fd) < fd) )
     *max_fd = fd;
 
   con_itr = daemon->connections;
@@ -908,6 +915,7 @@
  * returned value is how long select should at most
  * block, not the timeout value set for connections.
  *
+ * @param daemon daemon to query for timeout
  * @param timeout set to the timeout (in milliseconds)
  * @return MHD_YES on success, MHD_NO if timeouts are
  *        not used (or no connections exist that would

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2010-04-01 20:26:10 UTC (rev 
10746)
+++ libmicrohttpd/src/include/microhttpd.h      2010-04-01 21:53:24 UTC (rev 
10747)
@@ -81,7 +81,7 @@
 /**
  * Current version of the library.
  */
-#define MHD_VERSION 0x00040500
+#define MHD_VERSION 0x00040600
 
 /**
  * MHD-internal return code for "YES".
@@ -930,7 +930,7 @@
  * @param write_fd_set write set
  * @param except_fd_set except set
  * @param max_fd increased to largest FD added (if larger
- *               than existing value)
+ *               than existing value); can be NULL
  * @return MHD_YES on success, MHD_NO if this
  *         daemon was not started with the right
  *         options for this call.