From: Daniel Stenberg Date: Thu, 17 Feb 2011 21:34:18 +0000 (+0100) Subject: SOCKOPTFUNCTION: documented new return codes X-Git-Tag: curl-7_21_5~156 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c33b0a200ec8ce2a7446a361a389775c6a2a0a0;p=curl SOCKOPTFUNCTION: documented new return codes --- diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 7f3e27dd1..cb23c2396 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -271,6 +271,10 @@ discretion. Return 0 (zero) from the callback on success. Return 1 from the callback function to signal an unrecoverable error to the library and it will close the socket and return \fICURLE_COULDNT_CONNECT\fP. (Option added in 7.15.6.) + +Added in 7.21.5, the callback function may return +\fICURL_SOCKOPT_ALREADY_CONNECTED\fP, which tells libcurl that the socket is +in fact already connected and then libcurl will not attempt to connect it. .IP CURLOPT_SOCKOPTDATA Pass a pointer that will be untouched by libcurl and passed as the first argument in the sockopt callback set with \fICURLOPT_SOCKOPTFUNCTION\fP. diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index bacf5277e..1a8b04334 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -671,3 +671,6 @@ CURL_VERSION_SSL 7.10 CURL_VERSION_SSPI 7.13.2 CURL_VERSION_TLSAUTH_SRP 7.21.4 CURL_WRITEFUNC_PAUSE 7.18.0 +CURL_SOCKOPT_OK 7.21.5 +CURL_SOCKOPT_ERROR 7.21.5 +CURL_SOCKOPT_ALREADY_CONNECTED 7.21.5