From c9c5ce23652db79f36925c1509a15ddf4f665422 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 May 2006 22:17:42 +0000 Subject: David McCreedy provided a fix for CURLINFO_LASTSOCKET that does extended checks on the to-be-returned socket to make sure it truly seems to be alive and well. For SSL connection it (only) uses OpenSSL functions. --- lib/getinfo.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'lib/getinfo.c') diff --git a/lib/getinfo.c b/lib/getinfo.c index c7b4cfa4a..d74fbcf3c 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -75,6 +75,8 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...) double *param_doublep=NULL; char **param_charp=NULL; struct curl_slist **param_slistp=NULL; + char buf; + va_start(arg, info); switch(info&CURLINFO_TYPEMASK) { @@ -197,9 +199,23 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...) break; case CURLINFO_LASTSOCKET: if((data->state.lastconnect != -1) && - (data->state.connects[data->state.lastconnect] != NULL)) + (data->state.connects[data->state.lastconnect] != NULL)) { *param_longp = data->state.connects[data->state.lastconnect]-> sock[FIRSTSOCKET]; + /* we have a socket connected, let's determine if the server shut down */ + /* determine if ssl */ + if(data->state.connects[data->state.lastconnect]->protocol & PROT_SSL) { + /* use the SSL context */ + if (!Curl_ssl_check_cxn(data->state.connects[data->state.lastconnect])) + *param_longp = -1; /* FIN received */ + } + else { + /* use the socket */ + if(recv((int)data->state.connects[data->state.lastconnect]-> + sock[FIRSTSOCKET], (void*)&buf, 1, MSG_PEEK) == 0) + *param_longp = -1; /* FIN received */ + } + } else *param_longp = -1; break; -- cgit v1.2.3