diff options
| author | Jerome Vouillon <vouillon@pps.jussieu.fr> | 2010-04-16 22:43:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-04-16 22:43:01 +0200 |
| commit | c2888604d7ead19473b5621f8f2edab60fc418de (patch) | |
| tree | c8ce3f5e8ad594f03c34d38f176b351d500fb503 /lib/http.c | |
| parent | 6632d957e7d658566288406276dc98669e8228c7 (diff) | |
GnuTLS: make the connection phase non-blocking
When multi interface is used, the SSL handshake is no longer
blocking when GnuTLS is used.
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/http.c b/lib/http.c index 7ffc34d49..99d34e661 100644 --- a/lib/http.c +++ b/lib/http.c @@ -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 |