generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GnuTLS: make the connection phase non-blocking

Browse Source 
When multi interface is used, the SSL handshake is no longer
blocking when GnuTLS is used.
This commit is contained in:
Jerome Vouillon
2010-04-16 22:43:01 +02:00
committed by Daniel Stenberg
parent 6632d957e7
commit c2888604d7
4 changed files with 161 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/http.c
View File

@@ -1817,9 +1817,9 @@ static CURLcode https_connecting(struct connectdata *conn, bool *done)
}
#endif
#ifdef USE_SSLEAY
/* This function is OpenSSL-specific. It should be made to query the generic
SSL layer instead. */
#if defined(USE_SSLEAY) || defined(USE_GNUTLS)
/* This function is for OpenSSL and GnuTLS only. It should be made to query
the generic SSL layer instead. */
static int https_getsock(struct connectdata *conn,
curl_socket_t *socks,
int numsocks)
@@ -1844,17 +1844,6 @@ static int https_getsock(struct connectdata *conn,
return CURLE_OK;
}
#else
#ifdef USE_GNUTLS
static int https_getsock(struct connectdata *conn,
curl_socket_t *socks,
int numsocks)
{
(void)conn;
(void)socks;
(void)numsocks;
return GETSOCK_BLANK;
}
#else
#ifdef USE_NSS
static int https_getsock(struct connectdata *conn,
curl_socket_t *socks,
@@ -1879,7 +1868,6 @@ static int https_getsock(struct connectdata *conn,
#endif
#endif
#endif
#endif
/*
* Curl_http_done() gets called from Curl_done() after a single HTTP request