SOCKOPTFUNCTION: documented new return codes

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 7f3e27dd1a7a35b3ad1b4a2cb3df9786892fe683..cb23c239654794ccde9ac7e50156b16ed78249cb 100644 (file)
--- 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 bacf5277eb4fbe0d87075c52f484357bc87e27c4..1a8b043341499d27f80dd90ed0a308826fd6a7b6 100644 (file)
--- 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