diff options
| author | Razvan Cojocaru <rcojocaru@bitdefender.com> | 2015-08-21 10:29:05 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-08-24 12:34:17 +0200 |
| commit | 62f306ff34f569020ce54451da7c841d162710ac (patch) | |
| tree | 573f8b2cb9fdc34e6d06d35ac0fb8c90f1b4b6d9 /docs | |
| parent | 36f6f6f4f2331dbd276a8455ecdafc16aceecb80 (diff) | |
getinfo: added CURLINFO_ACTIVESOCKET
This patch addresses known bug #76, where on 64-bit Windows SOCKET is 64
bits wide, but long is only 32, making CURLINFO_LASTSOCKET unreliable.
Signed-off-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/KNOWN_BUGS | 5 | ||||
| -rw-r--r-- | docs/libcurl/curl_easy_getinfo.3 | 15 | ||||
| -rw-r--r-- | docs/libcurl/symbols-in-versions | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 345dc45d5..e0cd8e6ec 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -63,11 +63,6 @@ may have been fixed since this was written! any file at all. Like when using FTP. http://curl.haxx.se/bug/view.cgi?id=1063 -76. The SOCKET type in Win64 is 64 bits large (and thus so is curl_socket_t on - that platform), and long is only 32 bits. It makes it impossible for - curl_easy_getinfo() to return a socket properly with the CURLINFO_LASTSOCKET - option as for all other operating systems. - 75. NTLM authentication involving unicode user name or password only works properly if built with UNICODE defined together with the WinSSL/schannel backend. The original problem was mentioned in: diff --git a/docs/libcurl/curl_easy_getinfo.3 b/docs/libcurl/curl_easy_getinfo.3 index 82708bb60..87409a5f5 100644 --- a/docs/libcurl/curl_easy_getinfo.3 +++ b/docs/libcurl/curl_easy_getinfo.3 @@ -205,8 +205,19 @@ libcurl close the socket and cleanup other resources associated with the handle. This is typically used in combination with \fICURLOPT_CONNECT_ONLY(3)\fP. (Added in 7.15.2) -NOTE: this API is not really working on win64, since the SOCKET type on win64 -is 64 bit large while its 'long' is only 32 bits. +NOTE: this API is deprecated since it is not working on win64 where the SOCKET +type is 64 bits large while its 'long' is 32 bits. Use the +\fICURLINFO_ACTIVESOCKET\fP instead, if possible. +.IP CURLINFO_ACTIVESOCKET +Pass a pointer to a curl_socket_t to receive the active socket used by this +curl session. If the socket is no longer valid, -1 is returned. When you +finish working with the socket, you must call curl_easy_cleanup() as usual and +let libcurl close the socket and cleanup other resources associated with the +handle. This is typically used in combination with +\fICURLOPT_CONNECT_ONLY(3)\fP. + +NOTE: this is meant as a cross-platform, safe alternative to +\fICURLINFO_LASTSOCKET\fP, which does not work on win64. .IP CURLINFO_FTP_ENTRY_PATH Pass a pointer to a char pointer to receive a pointer to a string holding the path of the entry path. That is the initial path libcurl ended up in when diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 82933a71a..5a3068ec1 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -199,6 +199,7 @@ CURLGSSAPI_DELEGATION_NONE 7.22.0 CURLGSSAPI_DELEGATION_POLICY_FLAG 7.22.0 CURLHEADER_SEPARATE 7.37.0 CURLHEADER_UNIFIED 7.37.0 +CURLINFO_ACTIVESOCKET 7.45.0 CURLINFO_APPCONNECT_TIME 7.19.0 CURLINFO_CERTINFO 7.19.1 CURLINFO_CONDITION_UNMET 7.19.4 @@ -247,6 +248,7 @@ CURLINFO_RTSP_SESSION_ID 7.20.0 CURLINFO_SIZE_DOWNLOAD 7.4.1 CURLINFO_SIZE_UPLOAD 7.4.1 CURLINFO_SLIST 7.12.3 +CURLINFO_SOCKET 7.45.0 CURLINFO_SPEED_DOWNLOAD 7.4.1 CURLINFO_SPEED_UPLOAD 7.4.1 CURLINFO_SSL_DATA_IN 7.12.1 |