From 4c33b0a200ec8ce2a7446a361a389775c6a2a0a0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 17 Feb 2011 22:34:18 +0100 Subject: [PATCH] SOCKOPTFUNCTION: documented new return codes --- docs/libcurl/curl_easy_setopt.3 | 4 ++++ docs/libcurl/symbols-in-versions | 3 +++ 2 files changed, 7 insertions(+) diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 7f3e27d..cb23c23 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 bacf527..1a8b043 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 -- 2.7.4