[GNUnet-SVN] r15739 - in libmicrohttpd: . doc src/include

[gnunet]

Author: grothoff
Date: 2011-06-22 10:28:49 +0200 (Wed, 22 Jun 2011)
New Revision: 15739

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/doc/microhttpd.texi
   libmicrohttpd/src/include/microhttpd.h
Log:
docu

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-06-22 08:25:00 UTC (rev 15738)
+++ libmicrohttpd/ChangeLog     2011-06-22 08:28:49 UTC (rev 15739)
@@ -1,3 +1,8 @@
+Wed Jun 22 10:25:13 CEST 2011
+       Eliminate unnecessary (and badly synchronized) calls to
+       MHD_get_timeout in MHD_USE_THREAD_PER_CONNECTION mode.
+       Document that this is not acceptable. -CG
+
 Tue Jun 21 13:54:59 CEST 2011
        Fixing tiny memory leak in SSL code from 'gnutls_priority_init'.
        Fixing data race between code doing connection shutdown and

Modified: libmicrohttpd/doc/microhttpd.texi
===================================================================
--- libmicrohttpd/doc/microhttpd.texi   2011-06-22 08:25:00 UTC (rev 15738)
+++ libmicrohttpd/doc/microhttpd.texi   2011-06-22 08:28:49 UTC (rev 15739)
@@ -1165,7 +1165,12 @@
 Obtain timeout value for select for this daemon (only needed if
 connection timeout is used).  The returned value is how long
 @cfunction{select} should at most block, not the timeout value set for
-connections.
+connections.  This function must not be called if the
address@hidden mode is in use (since then it
+is not meaningful to ask for a timeout, after all, there is 
+concurrenct activity).  The function must also not be called by
+user-code if @code{MHD_USE_INTERNAL_SELECT} is in use.  In the latter
+case, the behavior is undefined.
 
 @table @var
 @cindex timeout

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2011-06-22 08:25:00 UTC (rev 
15738)
+++ libmicrohttpd/src/include/microhttpd.h      2011-06-22 08:28:49 UTC (rev 
15739)
@@ -1083,10 +1083,11 @@
                fd_set * write_fd_set, fd_set * except_fd_set, int *max_fd);
 
 /**
- * Obtain timeout value for select for this daemon
- * (only needed if connection timeout is used).  The
- * returned value is how long select should at most
- * block, not the timeout value set for connections.
+ * Obtain timeout value for select for this daemon (only needed if
+ * connection timeout is used).  The returned value is how long select
+ * should at most block, not the timeout value set for connections.
+ * This function MUST NOT be called if MHD is running with
+ * "MHD_USE_THREAD_PER_CONNECTION".
  *
  * @param daemon daemon to query for timeout
  * @param timeout set to the timeout (in milliseconds)