aboutsummaryrefslogtreecommitdiff
path: root/docs/libcurl
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-02-17 22:34:18 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-02-17 22:42:19 +0100
commit4c33b0a200ec8ce2a7446a361a389775c6a2a0a0 (patch)
tree1fcbc9d56fdd402b8b7dbd70c0d40d168b6e84c6 /docs/libcurl
parent1c3c0162c62e2788373261a43f484ff401017d8a (diff)
SOCKOPTFUNCTION: documented new return codes
Diffstat (limited to 'docs/libcurl')
-rw-r--r--docs/libcurl/curl_easy_setopt.34
-rw-r--r--docs/libcurl/symbols-in-versions3
2 files changed, 7 insertions, 0 deletions
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