aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2015-11-06 00:30:16 -0500
committerJay Satiro <raysatiro@yahoo.com>2015-11-06 00:30:16 -0500
commitcd3aba1a5c618bb20b418ac73d3627b21fb795c8 (patch)
tree56f6a817aa529eca578090dbd74becc7f20fbec0
parentf6fbbd6dc3bcc93c681b2f7a14a73fa561b00488 (diff)
getinfo: CURLINFO_ACTIVESOCKET: fix bad socket value
- Set user info param to the socket returned by Curl_getconnectinfo, regardless of if the socket is bad. Effectively this means the user info param now will receive CURL_SOCKET_BAD instead of -1 on bad socket. - Remove incorrect comments. CURLINFO_ACTIVESOCKET is documented to write CURL_SOCKET_BAD to user info param but prior to this change it wrote -1. Bug: https://github.com/bagder/curl/pull/518 Reported-by: Marcel Raad
-rw-r--r--lib/getinfo.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/getinfo.c b/lib/getinfo.c
index 7a687e8a2..2a0889739 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -335,20 +335,9 @@ static CURLcode getinfo_slist(struct SessionHandle *data, CURLINFO info,
static CURLcode getinfo_socket(struct SessionHandle *data, CURLINFO info,
curl_socket_t *param_socketp)
{
- curl_socket_t sockfd;
-
switch(info) {
case CURLINFO_ACTIVESOCKET:
- sockfd = Curl_getconnectinfo(data, NULL);
-
- /* note: this is not a good conversion for systems with 64 bit sockets and
- 32 bit longs */
- if(sockfd != CURL_SOCKET_BAD)
- *param_socketp = sockfd;
- else
- /* this interface is documented to return -1 in case of badness, which
- may not be the same as the CURL_SOCKET_BAD value */
- *param_socketp = -1;
+ *param_socketp = Curl_getconnectinfo(data, NULL);
break;
default:
return CURLE_UNKNOWN_OPTION;