From f60cb60fc61cf2e0c99f989785e930f83024509c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg <daniel@haxx.se> Date: Fri, 11 Sep 2009 20:19:21 +0000 Subject: [PATCH] point to the current functions, not the deprecated ones --- docs/libcurl/curl_multi_setopt.3 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/libcurl/curl_multi_setopt.3 b/docs/libcurl/curl_multi_setopt.3 index da4a8d367b..2cf4683143 100644 --- a/docs/libcurl/curl_multi_setopt.3 +++ b/docs/libcurl/curl_multi_setopt.3 @@ -20,14 +20,14 @@ You can only set one option in each function call. .SH OPTIONS .IP CURLMOPT_SOCKETFUNCTION Pass a pointer to a function matching the \fBcurl_socket_callback\fP -prototype. The \fIcurl_multi_socket(3)\fP functions inform the application -about updates in the socket (file descriptor) status by doing none, one, or -multiple calls to the curl_socket_callback given in the \fBparam\fP -argument. They update the status with changes since the previous time a -\fIcurl_multi_socket(3)\fP function was called. If the given callback pointer -is NULL, no callback will be called. Set the callback's \fBuserp\fP argument -with \fICURLMOPT_SOCKETDATA\fP. See \fIcurl_multi_socket(3)\fP for more -callback details. +prototype. The \fIcurl_multi_socket_action(3)\fP function informs the +application about updates in the socket (file descriptor) status by doing +none, one, or multiple calls to the curl_socket_callback given in the +\fBparam\fP argument. They update the status with changes since the previous +time a \fIcurl_multi_socket(3)\fP function was called. If the given callback +pointer is NULL, no callback will be called. Set the callback's \fBuserp\fP +argument with \fICURLMOPT_SOCKETDATA\fP. See \fIcurl_multi_socket(3)\fP for +more callback details. .IP CURLMOPT_SOCKETDATA Pass a pointer to whatever you want passed to the \fBcurl_socket_callback\fP's forth argument, the userp pointer. This is not used by libcurl but only @@ -45,13 +45,13 @@ Pass a pointer to a function matching the \fBcurl_multi_timer_callback\fP prototype. This function will then be called when the timeout value changes. The timeout value is at what latest time the application should call one of the \&"performing" functions of the multi interface -(\fIcurl_multi_socket(3)\fP, \fIcurl_multi_socket_all(3)\fP and -\fIcurl_multi_perform(3)\fP) - to allow libcurl to keep timeouts and retries -etc to work. A timeout value of -1 means that there is no timeout at all, and -0 means that the timeout is already reached. Libcurl attempts to limit calling -this only when the fixed future timeout time actually changes. See also -\fICURLMOPT_TIMERDATA\fP. This callback can be used instead of, or in addition -to, \fIcurl_multi_timeout(3)\fP. (Added in 7.16.0) +(\fIcurl_multi_socket_action(3)\fP and \fIcurl_multi_perform(3)\fP) - to allow +libcurl to keep timeouts and retries etc to work. A timeout value of -1 means +that there is no timeout at all, and 0 means that the timeout is already +reached. Libcurl attempts to limit calling this only when the fixed future +timeout time actually changes. See also \fICURLMOPT_TIMERDATA\fP. This +callback can be used instead of, or in addition to, +\fIcurl_multi_timeout(3)\fP. (Added in 7.16.0) .IP CURLMOPT_TIMERDATA Pass a pointer to whatever you want passed to the \fBcurl_multi_timer_callback\fP's third argument, the userp pointer. This is -- GitLab