diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2012-01-26 16:39:53 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2012-01-26 16:39:53 +0100 |
| commit | 8ee2576b6fcc8aee0c768255a55e255a1868b609 (patch) | |
| tree | 41dbe761ce20a76f3168257800bba199ed77ec47 /docs/libcurl/curl_easy_setopt.3 | |
| parent | 575f3c30ed60aafddbaeeb26745cca942fb9ee2f (diff) | |
| parent | cf9fb08ca4537d76afde44daf1e92307fe2882d3 (diff) | |
Merge branch 'master' of github.com:bagder/curl
Diffstat (limited to 'docs/libcurl/curl_easy_setopt.3')
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 9dcce8770..d94a84b78 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -266,7 +266,7 @@ If you forward the input arguments directly to "fseek" or "lseek", note that the data type for \fIoffset\fP is not the same as defined for curl_off_t on many systems! (Option added in 7.18.0) .IP CURLOPT_SEEKDATA -Data pointer to pass to the file read function. If you use the +Data pointer to pass to the file seek function. If you use the \fICURLOPT_SEEKFUNCTION\fP option, this is the pointer you'll get as input. If you don't specify a seek callback, NULL is passed. (Option added in 7.18.0) .IP CURLOPT_SOCKOPTFUNCTION @@ -322,7 +322,7 @@ to the \fICURLOPT_OPENSOCKETFUNCTION\fP option. Return 0 to signal success and 1 if there was an error. (Option added in 7.21.7) .IP CURLOPT_CLOSESOCKETDATA Pass a pointer that will be untouched by libcurl and passed as the first -argument in the opensocket callback set with +argument in the closesocket callback set with \fICURLOPT_CLOSESOCKETFUNCTION\fP. (Option added in 7.21.7) .IP CURLOPT_PROGRESSFUNCTION Function pointer that should match the \fIcurl_progress_callback\fP prototype @@ -2070,7 +2070,7 @@ This option requires that libcurl was built with a resolver backend that supports this operation. The c-ares backend is the only such one. (Added in 7.24.0) -.IP CURLOPT_ACCEPTTIMOUT_MS +.IP CURLOPT_ACCEPTTIMEOUT_MS Pass a long telling libcurl the maximum number of milliseconds to wait for a server to connect back to libcurl when an active FTP connection is used. If no timeout is set, the internal default of 60000 will be used. (Added in 7.24.0) |