commit c94103be0fe8221b26a26db0e35fddaa0f0ae2b4
parent d8a567a4698247a376323cb5c74c3966db90c488
Author: Sree Harsha Totakura <sreeharsha@totakura.in>
Date: Tue, 5 Aug 2014 13:17:57 +0000
Mention the timeout as milliseconds.
Diffstat:
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
@@ -1460,14 +1460,14 @@ the right options for this call.
@deftypefun int MHD_get_timeout (struct MHD_Daemon *daemon, unsigned long long *timeout)
@cindex timeout
Obtain timeout value for select for this daemon (only needed if
-connection timeout is used). The returned value is how long
-@code{select} should at most block, not the timeout value set for
-connections. This function must not be called if the
-@code{MHD_USE_THREAD_PER_CONNECTION} 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.
+connection timeout is used). The returned value is how many
+milliseconds @code{select} should at most block, not the timeout value
+set for connections. This function must not be called if the
+@code{MHD_USE_THREAD_PER_CONNECTION} 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
@item daemon
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -1531,10 +1531,10 @@ MHD_get_fdset2 (struct MHD_Daemon *daemon,
/**
* Obtain timeout value for `select()` for this daemon (only needed if
- * connection timeout is used). The returned value is how long
- * `select()` or `poll()` 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.
+ * connection timeout is used). The returned value is how many milliseconds
+ * `select()` or `poll()` 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)
